Sync 3rd party wallpaper app name

chrome/browser/chromeos/extensions/wallpaper_api.cc

Index: chrome/browser/chromeos/extensions/wallpaper_api.cc
diff --git a/chrome/browser/chromeos/extensions/wallpaper_api.cc b/chrome/browser/chromeos/extensions/wallpaper_api.cc
index 399b846a558a42e0ceef85e51f9fe990e66115c2..60c31f290963b84c7af2707e5bfb53e5215957a1 100644
--- a/chrome/browser/chromeos/extensions/wallpaper_api.cc
+++ b/chrome/browser/chromeos/extensions/wallpaper_api.cc
@@ -153,18 +153,6 @@ void WallpaperSetWallpaperFunction::OnWallpaperDecoded(
       user_manager::User::CUSTOMIZED, image, update_wallpaper);
   unsafe_wallpaper_decoder_ = NULL;
 
-  // Save current extenion name. It will be displayed in the component
-  // wallpaper picker app. If current extension is the component wallpaper
-  // picker, set an empty string.
-  Profile* profile = Profile::FromBrowserContext(browser_context());
-  if (extension()->id() == extension_misc::kWallpaperManagerId) {
-    profile->GetPrefs()->SetString(prefs::kCurrentWallpaperAppName,
-                                   std::string());
-  } else {
-    profile->GetPrefs()->SetString(prefs::kCurrentWallpaperAppName,
-                                   extension()->name());
-  }
-
   if (!params_->details.thumbnail)
     SendResponse(true);
 
@@ -219,6 +207,9 @@ void WallpaperSetWallpaperFunction::ThumbnailGenerated(
 
   // Inform the native Wallpaper Picker Application that the current wallpaper
   // has been modified by a third party application.
+  std::string third_party_appname;
+  if (extension()->id() != extension_misc::kWallpaperManagerId)
+    third_party_appname = extension()->name();
   Profile* profile = Profile::FromBrowserContext(browser_context());
   extensions::EventRouter* event_router = extensions::EventRouter::Get(profile);
   scoped_ptr<base::ListValue> event_args(new base::ListValue());
@@ -226,6 +217,7 @@ void WallpaperSetWallpaperFunction::ThumbnailGenerated(
   event_args->Append(thumbnail_result);
   event_args->Append(new base::StringValue(
       extensions::api::wallpaper::ToString(params_->details.layout)));
+  event_args->Append(new base::StringValue(third_party_appname));
   scoped_ptr<extensions::Event> event(new extensions::Event(
       extensions::events::WALLPAPER_PRIVATE_ON_WALLPAPER_CHANGED_BY_3RD_PARTY,
       extensions::api::wallpaper_private::OnWallpaperChangedBy3rdParty::