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

Unified Diff: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

Issue 7327007: Moving notification types which are chrome specific to a new header file chrome_notification_type... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 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
Index: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
===================================================================
--- chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm (revision 91968)
+++ chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm (working copy)
@@ -41,6 +41,7 @@
#include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
#include "chrome/browser/ui/content_settings/content_setting_image_model.h"
#include "chrome/browser/ui/omnibox/location_bar_util.h"
+#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_action.h"
#include "chrome/common/extensions/extension_resource.h"
@@ -100,7 +101,7 @@
}
registrar_.Add(this,
- NotificationType::EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED,
+ chrome::NOTIFICATION_EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED,
NotificationService::AllSources());
edit_bookmarks_enabled_.Init(prefs::kEditBookmarksEnabled,
@@ -181,7 +182,7 @@
Layout();
if (page_action_decorations_.size() != count_before) {
NotificationService::current()->Notify(
- NotificationType::EXTENSION_PAGE_ACTION_COUNT_CHANGED,
+ chrome::NOTIFICATION_EXTENSION_PAGE_ACTION_COUNT_CHANGED,
Source<LocationBar>(this),
NotificationService::NoDetails());
}
@@ -193,7 +194,7 @@
Layout();
if (page_action_decorations_.size() != count_before) {
NotificationService::current()->Notify(
- NotificationType::EXTENSION_PAGE_ACTION_COUNT_CHANGED,
+ chrome::NOTIFICATION_EXTENSION_PAGE_ACTION_COUNT_CHANGED,
Source<LocationBar>(this),
NotificationService::NoDetails());
}
@@ -474,11 +475,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::NOTIFICATION_EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED: {
TabContents* contents = GetTabContents();
if (Details<TabContents>(contents) != details)
return;
@@ -488,7 +489,7 @@
break;
}
- case NotificationType::PREF_CHANGED:
+ case chrome::NOTIFICATION_PREF_CHANGED:
star_decoration_->SetVisible(IsStarEnabled());
OnChanged();
break;

Powered by Google App Engine
This is Rietveld 408576698