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

Unified Diff: chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc

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
« no previous file with comments | « chrome/browser/ui/gtk/browser_actions_toolbar_gtk.h ('k') | chrome/browser/ui/gtk/browser_titlebar.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
===================================================================
--- chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc (revision 91968)
+++ chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc (working copy)
@@ -26,6 +26,7 @@
#include "chrome/browser/ui/gtk/menu_gtk.h"
#include "chrome/browser/ui/gtk/view_id_util.h"
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.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"
@@ -33,7 +34,6 @@
#include "content/common/notification_details.h"
#include "content/common/notification_service.h"
#include "content/common/notification_source.h"
-#include "content/common/notification_type.h"
#include "grit/theme_resources.h"
#include "grit/theme_resources_standard.h"
#include "grit/ui_resources.h"
@@ -129,7 +129,7 @@
signals_.ConnectAfter(widget(), "expose-event",
G_CALLBACK(OnExposeEvent), this);
- registrar_.Add(this, NotificationType::EXTENSION_BROWSER_ACTION_UPDATED,
+ registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_UPDATED,
Source<ExtensionAction>(extension->browser_action()));
}
@@ -150,10 +150,10 @@
const Extension* extension() { return extension_; }
// NotificationObserver implementation.
- void Observe(NotificationType type,
+ void Observe(int type,
const NotificationSource& source,
const NotificationDetails& details) {
- if (type == NotificationType::EXTENSION_BROWSER_ACTION_UPDATED)
+ if (type == chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_UPDATED)
UpdateState();
else
NOTREACHED();
@@ -449,7 +449,7 @@
ViewIDUtil::SetID(button_hbox_.get(), VIEW_ID_BROWSER_ACTION_TOOLBAR);
registrar_.Add(this,
- NotificationType::BROWSER_THEME_CHANGED,
+ chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
NotificationService::AllSources());
theme_service_->InitThemesFor(this);
}
@@ -476,10 +476,10 @@
}
}
-void BrowserActionsToolbarGtk::Observe(NotificationType type,
+void BrowserActionsToolbarGtk::Observe(int type,
const NotificationSource& source,
const NotificationDetails& details) {
- DCHECK(NotificationType::BROWSER_THEME_CHANGED == type);
+ DCHECK(chrome::NOTIFICATION_BROWSER_THEME_CHANGED == type);
gtk_widget_set_visible(separator_, theme_service_->UsingNativeTheme());
}
« no previous file with comments | « chrome/browser/ui/gtk/browser_actions_toolbar_gtk.h ('k') | chrome/browser/ui/gtk/browser_titlebar.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698