Index: chrome/browser/chromeos/extensions/wallpaper_private_api.cc |
diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc |
index fa62a40517d70d7b173c027d7b9ab2c09bfb297c..f944243b4a3bb6767f45430d605cca8ec014e81e 100644 |
--- a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc |
+++ b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc |
@@ -263,6 +263,8 @@ bool WallpaperPrivateGetStringsFunction::RunSync() { |
SET_STRING("invalidWallpaper", IDS_WALLPAPER_MANAGER_INVALID_WALLPAPER); |
SET_STRING("surpriseMeLabel", IDS_WALLPAPER_MANAGER_SURPRISE_ME_LABEL); |
SET_STRING("learnMore", IDS_LEARN_MORE); |
+ SET_STRING("currentWallpaperSetByMessage", |
+ IDS_CURRENT_WALLPAPER_SET_BY_MESSAGE); |
#undef SET_STRING |
webui::SetFontAndTextDirection(dict); |
@@ -278,6 +280,12 @@ bool WallpaperPrivateGetStringsFunction::RunSync() { |
dict->SetString("manifestBaseURL", kWallpaperManifestBaseURL); |
#endif |
+ Profile* profile = Profile::FromBrowserContext(browser_context()); |
+ std::string app_name( |
+ profile->GetPrefs()->GetString(prefs::kCurrentWallpaperAppName)); |
+ if (!app_name.empty()) |
+ dict->SetString("wallpaperAppName", app_name); |
+ |
dict->SetBoolean("isOEMDefaultWallpaper", IsOEMDefaultWallpaper()); |
dict->SetString("canceledWallpaper", |
wallpaper_api_util::kCancelWallpaperMessage); |