Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(593)

Unified Diff: chrome/browser/chromeos/extensions/wallpaper_api.cc

Issue 1631923004: Sync 3rd party wallpaper app name (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address tbarzic@'s comment. Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/chromeos/extensions/wallpaper_private_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 0789cf812ba607f0354cc28a0baa79dc4e5dfb2e..6c401eb831ff175279a84ec7094640f6d75406dd 100644
--- a/chrome/browser/chromeos/extensions/wallpaper_api.cc
+++ b/chrome/browser/chromeos/extensions/wallpaper_api.cc
@@ -219,20 +219,24 @@ void WallpaperSetWallpaperFunction::ThumbnailGenerated(
// Inform the native Wallpaper Picker Application that the current wallpaper
// has been modified by a third party application.
- Profile* profile = Profile::FromBrowserContext(browser_context());
- extensions::EventRouter* event_router = extensions::EventRouter::Get(profile);
- scoped_ptr<base::ListValue> event_args(new base::ListValue());
- event_args->Append(original_result);
- event_args->Append(thumbnail_result);
- event_args->Append(new base::StringValue(
- extensions::api::wallpaper::ToString(params_->details.layout)));
- scoped_ptr<extensions::Event> event(new extensions::Event(
- extensions::events::WALLPAPER_PRIVATE_ON_WALLPAPER_CHANGED_BY_3RD_PARTY,
- extensions::api::wallpaper_private::OnWallpaperChangedBy3rdParty::
- kEventName,
- std::move(event_args)));
- event_router->DispatchEventToExtension(extension_misc::kWallpaperManagerId,
- std::move(event));
+ if (extension()->id() != extension_misc::kWallpaperManagerId) {
+ Profile* profile = Profile::FromBrowserContext(browser_context());
+ extensions::EventRouter* event_router =
+ extensions::EventRouter::Get(profile);
+ scoped_ptr<base::ListValue> event_args(new base::ListValue());
+ event_args->Append(original_result);
+ event_args->Append(thumbnail_result);
+ event_args->Append(new base::StringValue(
+ extensions::api::wallpaper::ToString(params_->details.layout)));
+ event_args->Append(new base::StringValue(extension()->name()));
+ scoped_ptr<extensions::Event> event(new extensions::Event(
+ extensions::events::WALLPAPER_PRIVATE_ON_WALLPAPER_CHANGED_BY_3RD_PARTY,
+ extensions::api::wallpaper_private::OnWallpaperChangedBy3rdParty::
+ kEventName,
+ std::move(event_args)));
+ event_router->DispatchEventToExtension(extension_misc::kWallpaperManagerId,
+ std::move(event));
+ }
}
void WallpaperSetWallpaperFunction::OnWallpaperFetched(
« no previous file with comments | « no previous file | chrome/browser/chromeos/extensions/wallpaper_private_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698