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

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

Issue 425303002: Move extension notifications to extensions/browser/notification_types.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: (extension-notifications) rebase Created 6 years, 5 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 d9a91ce71a0c3734a3148a8741ba0f2da3761f0f..55bf31d291ef57f1a2cd0276ac6b973c29d3ea63 100644
--- a/chrome/browser/extensions/extension_disabled_ui.cc
+++ b/chrome/browser/extensions/extension_disabled_ui.cc
@@ -15,7 +15,6 @@
#include "base/metrics/histogram.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/extensions/extension_install_prompt.h"
#include "chrome/browser/extensions/extension_install_ui.h"
#include "chrome/browser/extensions/extension_service.h"
@@ -34,6 +33,7 @@
#include "content/public/browser/notification_source.h"
#include "extensions/browser/extension_util.h"
#include "extensions/browser/image_loader.h"
+#include "extensions/browser/notification_types.h"
#include "extensions/browser/uninstall_reason.h"
#include "extensions/common/constants.h"
#include "extensions/common/extension.h"
@@ -223,9 +223,10 @@ ExtensionDisabledGlobalError::ExtensionDisabledGlobalError(
gfx::Size(kIconSize, kIconSize)));
}
registrar_.Add(this,
- chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
+ extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
content::Source<Profile>(service->profile()));
- registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_REMOVED,
+ registrar_.Add(this,
+ extensions::NOTIFICATION_EXTENSION_REMOVED,
content::Source<Profile>(service->profile()));
}
@@ -382,17 +383,17 @@ 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_DEPRECATED ||
- type == chrome::NOTIFICATION_EXTENSION_REMOVED);
+ DCHECK(type == extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED ||
+ type == extensions::NOTIFICATION_EXTENSION_REMOVED);
const Extension* extension = content::Details<const Extension>(details).ptr();
if (extension != extension_)
return;
GlobalErrorServiceFactory::GetForProfile(service_->profile())->
RemoveGlobalError(this);
- if (type == chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED)
+ if (type == extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED)
user_response_ = REENABLE;
- else if (type == chrome::NOTIFICATION_EXTENSION_REMOVED)
+ else if (type == extensions::NOTIFICATION_EXTENSION_REMOVED)
user_response_ = UNINSTALL;
delete this;
}
« no previous file with comments | « chrome/browser/extensions/extension_browsertest.cc ('k') | chrome/browser/extensions/extension_error_reporter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698