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

Unified Diff: chrome/browser/extensions/extension_browsertest.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
« no previous file with comments | « chrome/browser/extensions/extension_apitest.cc ('k') | chrome/browser/extensions/extension_disabled_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_browsertest.cc
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc
index bb263946fce2340abe729ab319f123dd0a0c7e30..56906aef25fdf184ddfd93ca06f368adaf865319 100644
--- a/chrome/browser/extensions/extension_browsertest.cc
+++ b/chrome/browser/extensions/extension_browsertest.cc
@@ -14,7 +14,6 @@
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/extensions/browsertest_util.h"
#include "chrome/browser/extensions/component_loader.h"
#include "chrome/browser/extensions/crx_installer.h"
@@ -43,6 +42,7 @@
#include "extensions/browser/extension_host.h"
#include "extensions/browser/extension_prefs.h"
#include "extensions/browser/extension_system.h"
+#include "extensions/browser/notification_types.h"
#include "extensions/browser/uninstall_reason.h"
#include "extensions/common/constants.h"
#include "extensions/common/extension_set.h"
@@ -151,7 +151,7 @@ ExtensionBrowserTest::LoadExtensionWithInstallParam(
ExtensionService* service = extensions::ExtensionSystem::Get(
profile())->extension_service();
{
- observer_->Watch(chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
+ observer_->Watch(extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
content::NotificationService::AllSources());
scoped_refptr<extensions::UnpackedInstaller> installer(
@@ -197,7 +197,7 @@ ExtensionBrowserTest::LoadExtensionWithInstallParam(
// Re-enable the extension if needed.
if (service->extensions()->Contains(extension_id)) {
content::WindowedNotificationObserver load_signal(
- chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
+ extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
content::Source<Profile>(profile()));
// Reload the extension so that the
// NOTIFICATION_EXTENSION_LOADED_DEPRECATED
@@ -215,7 +215,7 @@ ExtensionBrowserTest::LoadExtensionWithInstallParam(
// cases.
{
content::WindowedNotificationObserver load_signal(
- chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
+ extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
content::Source<Profile>(profile()));
CHECK(!extensions::util::IsIncognitoEnabled(extension_id, profile()));
@@ -229,7 +229,7 @@ ExtensionBrowserTest::LoadExtensionWithInstallParam(
{
content::WindowedNotificationObserver load_signal(
- chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
+ extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
content::Source<Profile>(profile()));
CHECK(extensions::util::AllowFileAccess(extension_id, profile()));
if (!(flags & kFlagEnableFileAccess)) {
@@ -495,7 +495,7 @@ const Extension* ExtensionBrowserTest::InstallOrUpdateExtension(
}
observer_->Watch(
- chrome::NOTIFICATION_CRX_INSTALLER_DONE,
+ extensions::NOTIFICATION_CRX_INSTALLER_DONE,
content::Source<extensions::CrxInstaller>(installer.get()));
installer->InstallCrx(crx_path);
@@ -531,7 +531,7 @@ const Extension* ExtensionBrowserTest::InstallOrUpdateExtension(
}
void ExtensionBrowserTest::ReloadExtension(const std::string extension_id) {
- observer_->Watch(chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
+ observer_->Watch(extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
content::NotificationService::AllSources());
ExtensionService* service =
« no previous file with comments | « chrome/browser/extensions/extension_apitest.cc ('k') | chrome/browser/extensions/extension_disabled_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698