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

Unified Diff: chrome/browser/extensions/extension_disabled_ui.cc

Issue 242613004: Replace NOTIFICATION_EXTENSION_LOADED to NOTIFICATION_EXTENSION_LOADED_DEPRECATED (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 8 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
Index: chrome/browser/extensions/extension_disabled_ui.cc
diff --git a/chrome/browser/extensions/extension_disabled_ui.cc b/chrome/browser/extensions/extension_disabled_ui.cc
index b264adbb5d2eacee58e1ea43440079c08aa14c97..8626b11c378fbbfbe2801a0f86e1891e814087f6 100644
--- a/chrome/browser/extensions/extension_disabled_ui.cc
+++ b/chrome/browser/extensions/extension_disabled_ui.cc
@@ -209,7 +209,8 @@ ExtensionDisabledGlobalError::ExtensionDisabledGlobalError(
skia::ImageOperations::RESIZE_BEST,
gfx::Size(kIconSize, kIconSize)));
}
- registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
+ registrar_.Add(this,
+ chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
content::Source<Profile>(service->profile()));
registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_REMOVED,
content::Source<Profile>(service->profile()));
@@ -316,7 +317,7 @@ void ExtensionDisabledGlobalError::Observe(
const content::NotificationSource& source,
const content::NotificationDetails& details) {
// The error is invalidated if the extension has been loaded or removed.
- DCHECK(type == chrome::NOTIFICATION_EXTENSION_LOADED ||
+ DCHECK(type == chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED ||
type == chrome::NOTIFICATION_EXTENSION_REMOVED);
const Extension* extension = content::Details<const Extension>(details).ptr();
if (extension != extension_)
@@ -324,7 +325,7 @@ void ExtensionDisabledGlobalError::Observe(
GlobalErrorServiceFactory::GetForProfile(service_->profile())->
RemoveGlobalError(this);
- if (type == chrome::NOTIFICATION_EXTENSION_LOADED)
+ if (type == chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED)
user_response_ = REENABLE;
else if (type == chrome::NOTIFICATION_EXTENSION_REMOVED)
user_response_ = UNINSTALL;
« no previous file with comments | « chrome/browser/extensions/extension_browsertest.cc ('k') | chrome/browser/extensions/extension_functional_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698