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

chrome/browser/ui/gtk/global_history_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_history_menu.h"
 
 #include <gtk/gtk.h>
 
 #include "base/stl_util-inl.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tab_restore_service_delegate.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/browser/ui/gtk/owned_widget_gtk.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/url_constants.h"
 #include "content/common/notification_service.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/gtk_util.h"
 
 namespace {
 
@@ skipping 78 matching lines @@
   g_signal_connect(history_menu_item, "activate",
                    G_CALLBACK(OnMenuActivateThunk), this);
 
   if (profile_) {
     top_sites_ = profile_->GetTopSites();
     if (top_sites_) {
       GetTopSitesData();
 
       // Register for notification when TopSites changes so that we can update
       // ourself.
-      registrar_.Add(this, NotificationType::TOP_SITES_CHANGED,
+      registrar_.Add(this, chrome::NOTIFICATION_TOP_SITES_CHANGED,
                      Source<history::TopSites>(top_sites_));
     }
   }
 }
 
 void GlobalHistoryMenu::GetTopSitesData() {
   DCHECK(top_sites_);
 
   top_sites_->GetMostVisitedURLs(
       &top_sites_consumer_,
@@ skipping 139 matching lines @@
     }
 
     GtkWidget* submenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(menu_item));
     if (submenu)
       closure->menu_bar->ClearMenuSection(submenu, closure->tag);
 
     gtk_container_remove(GTK_CONTAINER(closure->container), menu_item);
   }
 }
 
-void GlobalHistoryMenu::Observe(NotificationType type,
+void GlobalHistoryMenu::Observe(int type,
                                 const NotificationSource& source,
                                 const NotificationDetails& details) {
-  if (type.value == NotificationType::TOP_SITES_CHANGED) {
+  if (type == chrome::NOTIFICATION_TOP_SITES_CHANGED) {
     if (Source<history::TopSites>(source).ptr() == top_sites_)
       GetTopSitesData();
   } else {
     NOTREACHED();
   }
 }
 
 void GlobalHistoryMenu::TabRestoreServiceChanged(TabRestoreService* service) {
   const TabRestoreService::Entries& entries = service->entries();
 
@@ skipping 139 matching lines @@
       tab_restore_service_->LoadTabsFromLastSession();
       tab_restore_service_->AddObserver(this);
 
       // If LoadTabsFromLastSession doesn't load tabs, it won't call
       // TabRestoreServiceChanged(). This ensures that all new windows after
       // the first one will have their menus populated correctly.
       TabRestoreServiceChanged(tab_restore_service_);
     }
   }
 }