Index: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm |
=================================================================== |
--- chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm (revision 91880) |
+++ chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm (working copy) |
@@ -100,7 +100,7 @@ |
} |
registrar_.Add(this, |
- NotificationType::EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED, |
+ chrome::EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED, |
NotificationService::AllSources()); |
edit_bookmarks_enabled_.Init(prefs::kEditBookmarksEnabled, |
@@ -181,7 +181,7 @@ |
Layout(); |
if (page_action_decorations_.size() != count_before) { |
NotificationService::current()->Notify( |
- NotificationType::EXTENSION_PAGE_ACTION_COUNT_CHANGED, |
+ chrome::EXTENSION_PAGE_ACTION_COUNT_CHANGED, |
Source<LocationBar>(this), |
NotificationService::NoDetails()); |
} |
@@ -193,7 +193,7 @@ |
Layout(); |
if (page_action_decorations_.size() != count_before) { |
NotificationService::current()->Notify( |
- NotificationType::EXTENSION_PAGE_ACTION_COUNT_CHANGED, |
+ chrome::EXTENSION_PAGE_ACTION_COUNT_CHANGED, |
Source<LocationBar>(this), |
NotificationService::NoDetails()); |
} |
@@ -474,11 +474,11 @@ |
return OmniboxViewMac::ImageForResource(IDR_OMNIBOX_SEARCH); |
} |
-void LocationBarViewMac::Observe(NotificationType type, |
+void LocationBarViewMac::Observe(int type, |
const NotificationSource& source, |
const NotificationDetails& details) { |
- switch (type.value) { |
- case NotificationType::EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED: { |
+ switch (type) { |
+ case chrome::EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED: { |
TabContents* contents = GetTabContents(); |
if (Details<TabContents>(contents) != details) |
return; |
@@ -488,7 +488,7 @@ |
break; |
} |
- case NotificationType::PREF_CHANGED: |
+ case chrome::PREF_CHANGED: |
star_decoration_->SetVisible(IsStarEnabled()); |
OnChanged(); |
break; |