Moving notification types which are chrome specific to a new header file chrome_notification_type...

chrome/browser/ui/gtk/global_bookmark_menu.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/gtk/global_bookmark_menu.h"
 
 #include <dlfcn.h>
 #include <gtk/gtk.h>
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h"
 #include "chrome/browser/ui/gtk/global_bookmark_menu.h"
 #include "chrome/browser/ui/gtk/global_menu_bar.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "content/common/notification_service.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/gtk_util.h"
 
 namespace {
 
 // We need to know whether we're using a newer GTK at run time because we need
 // to prevent.
 //
@@ skipping 22 matching lines @@
 
 GlobalBookmarkMenu::GlobalBookmarkMenu(Browser* browser)
     : browser_(browser),
       profile_(browser->profile()),
       default_favicon_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
   DCHECK(profile_);
 
   default_favicon_ = GtkThemeService::GetDefaultFavicon(true);
   default_folder_ = GtkThemeService::GetFolderIcon(true);
-  registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED,
+  registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  Source<ThemeService>(
                      ThemeServiceFactory::GetForProfile(profile_)));
 }
 
 GlobalBookmarkMenu::~GlobalBookmarkMenu() {
   profile_->GetBookmarkModel()->RemoveObserver(this);
 }
 
 void GlobalBookmarkMenu::Init(GtkWidget* bookmark_menu,
                               GtkWidget* bookmark_menu_item) {
@@ skipping 144 matching lines @@
 }
 
 // static
 void GlobalBookmarkMenu::ClearBookmarkItemCallback(GtkWidget* menu_item,
                                                    void* unused) {
   int tag = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menu_item), "type-tag"));
   if (tag == GlobalMenuBar::TAG_BOOKMARK_CLEARABLE)
     gtk_widget_destroy(menu_item);
 }
 
-void GlobalBookmarkMenu::Observe(NotificationType type,
+void GlobalBookmarkMenu::Observe(int type,
                                  const NotificationSource& source,
                                  const NotificationDetails& details) {
-  DCHECK(type.value == NotificationType::BROWSER_THEME_CHANGED);
+  DCHECK(type == chrome::NOTIFICATION_BROWSER_THEME_CHANGED);
 
   // Change the icon and invalidate the menu.
   default_favicon_ = GtkThemeService::GetDefaultFavicon(true);
   default_folder_ = GtkThemeService::GetFolderIcon(true);
   RebuildMenuInFuture();
 }
 
 void GlobalBookmarkMenu::Loaded(BookmarkModel* model) {
   // If we have a Loaded() event, then we need to build the menu immediately
   // for the first time.
@@ skipping 52 matching lines @@
 void GlobalBookmarkMenu::OnBookmarkItemActivated(GtkWidget* menu_item) {
   // The actual mouse event that generated this activated event was in a
   // different process. Go with something default.
   const BookmarkNode* node = static_cast<const BookmarkNode*>(
       g_object_get_data(G_OBJECT(menu_item), "bookmark-node"));
 
   browser_->OpenURL(node->GetURL(), GURL(), NEW_FOREGROUND_TAB,
                     PageTransition::AUTO_BOOKMARK);
 }