| 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;
|
|
|