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

Unified Diff: apps/app_window.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 | « apps/app_restore_service_browsertest.cc ('k') | apps/saved_files_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: apps/app_window.cc
diff --git a/apps/app_window.cc b/apps/app_window.cc
index d3a752b50a806371af09a9cdc081eb47a6f0372d..3f0ec2f31f983cd6e25927a9edddacd9781abe81 100644
--- a/apps/app_window.cc
+++ b/apps/app_window.cc
@@ -39,6 +39,7 @@
#include "extensions/browser/extension_registry.h"
#include "extensions/browser/extension_system.h"
#include "extensions/browser/extensions_browser_client.h"
+#include "extensions/browser/notification_types.h"
#include "extensions/browser/process_manager.h"
#include "extensions/browser/view_type_utils.h"
#include "extensions/common/extension.h"
@@ -326,7 +327,7 @@ void AppWindow::Init(const GURL& url,
extensions::ExtensionsBrowserClient* client =
extensions::ExtensionsBrowserClient::Get();
registrar_.Add(this,
- chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
+ extensions::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
content::Source<content::BrowserContext>(
client->GetOriginalContext(browser_context_)));
// Close when the browser process is exiting.
@@ -334,10 +335,11 @@ void AppWindow::Init(const GURL& url,
chrome::NOTIFICATION_APP_TERMINATING,
content::NotificationService::AllSources());
// Update the app menu if an ephemeral app becomes installed.
- registrar_.Add(this,
- chrome::NOTIFICATION_EXTENSION_WILL_BE_INSTALLED_DEPRECATED,
- content::Source<content::BrowserContext>(
- client->GetOriginalContext(browser_context_)));
+ registrar_.Add(
+ this,
+ extensions::NOTIFICATION_EXTENSION_WILL_BE_INSTALLED_DEPRECATED,
+ content::Source<content::BrowserContext>(
+ client->GetOriginalContext(browser_context_)));
app_window_contents_->LoadContents(new_params.creator_process_id);
@@ -996,7 +998,7 @@ void AppWindow::Observe(int type,
const content::NotificationSource& source,
const content::NotificationDetails& details) {
switch (type) {
- case chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED: {
+ case extensions::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED: {
const extensions::Extension* unloaded_extension =
content::Details<extensions::UnloadedExtensionInfo>(details)
->extension;
@@ -1004,7 +1006,7 @@ void AppWindow::Observe(int type,
native_app_window_->Close();
break;
}
- case chrome::NOTIFICATION_EXTENSION_WILL_BE_INSTALLED_DEPRECATED: {
+ case extensions::NOTIFICATION_EXTENSION_WILL_BE_INSTALLED_DEPRECATED: {
const extensions::Extension* installed_extension =
content::Details<const extensions::InstalledExtensionInfo>(details)
->extension;
« no previous file with comments | « apps/app_restore_service_browsertest.cc ('k') | apps/saved_files_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698