Merge pull request #5359 from brave/hotfix_for_SI_centerpoint_1.8.x

Hotfix for si centerpoint 1.8.x (Uplift to 1.8.x)
brave · Apr 26, 2020 · 51b6425 · 51b6425
2 parents 6ec00d1 + 0768407
commit 51b6425
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/browser/ntp_background_images/android/ntp_background_images_bridge.cc b/browser/ntp_background_images/android/ntp_background_images_bridge.cc
@@ -122,8 +122,8 @@ NTPBackgroundImagesBridge::CreateWallpaper() {
   if (!image_path || !logo_image_path)
     return base::android::ScopedJavaLocalRef<jobject>();
 
-  auto focal_point_x = data.FindIntPath("focalPoint.x");
-  auto focal_point_y = data.FindIntPath("focalPoint.y");
+  auto focal_point_x = data.FindIntPath("wallpaperFocalPointX");
+  auto focal_point_y = data.FindIntPath("wallpaperFocalPointY");
   auto* logo_destination_url = data.FindStringPath("logo.destinationUrl");
 
   return Java_NTPBackgroundImagesBridge_createWallpaper(

diff --git a/components/ntp_background_images/browser/ntp_background_images_data.cc b/components/ntp_background_images/browser/ntp_background_images_data.cc
@@ -167,6 +167,8 @@ base::Value NTPBackgroundImagesData::GetBackgroundAt(size_t index) {
                     wallpaper_image_urls()[index]);
   data.SetStringKey("wallpaperImagePath",
                     backgrounds[index].image_file.AsUTF8Unsafe());
+  data.SetIntKey("wallpaperFocalPointX", backgrounds[index].focal_point.x());
+  data.SetIntKey("wallpaperFocalPointY", backgrounds[index].focal_point.y());
   base::Value logo_data(base::Value::Type::DICTIONARY);
   logo_data.SetStringKey("image", logo_image_url());
   logo_data.SetStringKey("imagePath", logo_image_file.AsUTF8Unsafe());