Index: chrome/browser/ui/browser.cc |
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc |
index 098143203a71656b9a6db5493cc0a9a29f7a7f4f..315decbd0c690cd312eb44c1e56b44cf3b712f73 100644 |
--- a/chrome/browser/ui/browser.cc |
+++ b/chrome/browser/ui/browser.cc |
@@ -377,14 +377,16 @@ Browser::Browser(const CreateParams& params) |
search_delegate_.reset(new SearchDelegate(search_model_.get())); |
registrar_.Add(this, |
- chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED, |
+ extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED, |
content::Source<Profile>(profile_->GetOriginalProfile())); |
- registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED, |
+ registrar_.Add(this, |
+ extensions::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED, |
content::Source<Profile>(profile_->GetOriginalProfile())); |
registrar_.Add(this, |
- chrome::NOTIFICATION_EXTENSION_UNINSTALLED_DEPRECATED, |
+ extensions::NOTIFICATION_EXTENSION_UNINSTALLED_DEPRECATED, |
content::Source<Profile>(profile_->GetOriginalProfile())); |
- registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_PROCESS_TERMINATED, |
+ registrar_.Add(this, |
+ extensions::NOTIFICATION_EXTENSION_PROCESS_TERMINATED, |
content::NotificationService::AllSources()); |
#if defined(ENABLE_THEMES) |
registrar_.Add( |
@@ -1918,7 +1920,7 @@ void Browser::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: { |
chrome::UpdateCommandEnabled( |
this, |
IDC_BOOKMARK_PAGE, |
@@ -1959,14 +1961,14 @@ void Browser::Observe(int type, |
break; |
} |
- case chrome::NOTIFICATION_EXTENSION_PROCESS_TERMINATED: { |
+ case extensions::NOTIFICATION_EXTENSION_PROCESS_TERMINATED: { |
Profile* profile = content::Source<Profile>(source).ptr(); |
if (profile_->IsSameProfile(profile) && window()->GetLocationBar()) |
window()->GetLocationBar()->InvalidatePageActions(); |
break; |
} |
- case chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED: |
+ case extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED: |
chrome::UpdateCommandEnabled( |
this, |
IDC_BOOKMARK_PAGE, |
@@ -1976,7 +1978,7 @@ void Browser::Observe(int type, |
IDC_BOOKMARK_ALL_TABS, |
!chrome::ShouldRemoveBookmarkOpenPagesUI(profile_)); |
// fallthrough |
- case chrome::NOTIFICATION_EXTENSION_UNINSTALLED_DEPRECATED: |
+ case extensions::NOTIFICATION_EXTENSION_UNINSTALLED_DEPRECATED: |
// During window creation on Windows we may end up calling into |
// SHAppBarMessage, which internally spawns a nested message loop. This |
// makes it possible for us to end up here before window creation has |