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

chrome/browser/ui/cocoa/history_menu_bridge.mm

 // 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/cocoa/history_menu_bridge.h"
 
 #include "base/callback.h"
 #include "base/stl_util-inl.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"  // IDC_HISTORY_MENU
 #import "chrome/browser/app_controller_mac.h"
 #include "chrome/browser/history/page_usage_data.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #import "chrome/browser/ui/cocoa/history_menu_cocoa_controller.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/url_constants.h"
 #include "content/common/notification_registrar.h"
 #include "content/common/notification_service.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "grit/ui_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 67 matching lines @@
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   default_favicon_.reset([gfx::GetCachedImageWithName(@"nav.pdf") retain]);
 
   // Set the static icons in the menu.
   NSMenuItem* item = [HistoryMenu() itemWithTag:IDC_SHOW_HISTORY];
   [item setImage:rb.GetNativeImageNamed(IDR_HISTORY_FAVICON)];
 
   // The service is not ready for use yet, so become notified when it does.
   if (!history_service_) {
     registrar_.Add(
-        this, NotificationType::HISTORY_LOADED, Source<Profile>(profile_));
+        this, chrome::NOTIFICATION_HISTORY_LOADED, Source<Profile>(profile_));
   }
 }
 
 // Note that all requests sent to either the history service or the favicon
 // service will be automatically cancelled by their respective Consumers, so
 // task cancellation is not done manually here in the dtor.
 HistoryMenuBridge::~HistoryMenuBridge() {
   // Unregister ourselves as observers and notifications.
   if (history_service_) {
     const NotificationSource& src = NotificationService::AllSources();
-    registrar_.Remove(this, NotificationType::HISTORY_TYPED_URLS_MODIFIED, src);
-    registrar_.Remove(this, NotificationType::HISTORY_URL_VISITED, src);
-    registrar_.Remove(this, NotificationType::HISTORY_URLS_DELETED, src);
+    registrar_.Remove(this, chrome::NOTIFICATION_HISTORY_TYPED_URLS_MODIFIED,
+                      src);
+    registrar_.Remove(this, chrome::NOTIFICATION_HISTORY_URL_VISITED, src);
+    registrar_.Remove(this, chrome::NOTIFICATION_HISTORY_URLS_DELETED, src);
   } else {
     registrar_.Remove(
-        this, NotificationType::HISTORY_LOADED, Source<Profile>(profile_));
+        this, chrome::NOTIFICATION_HISTORY_LOADED, Source<Profile>(profile_));
   }
 
   if (tab_restore_service_)
     tab_restore_service_->RemoveObserver(this);
 
   // Since the map owns the HistoryItems, delete anything that still exists.
   std::map<NSMenuItem*, HistoryItem*>::iterator it = menu_item_map_.begin();
   while (it != menu_item_map_.end()) {
     HistoryItem* item  = it->second;
     menu_item_map_.erase(it++);
     delete item;
   }
 }
 
-void HistoryMenuBridge::Observe(NotificationType type,
+void HistoryMenuBridge::Observe(int type,
                                 const NotificationSource& source,
                                 const NotificationDetails& details) {
   // A history service is now ready. Check to see if it's the one for the main
   // profile. If so, perform final initialization.
-  if (type == NotificationType::HISTORY_LOADED) {
+  if (type == chrome::NOTIFICATION_HISTORY_LOADED) {
     HistoryService* hs =
         profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
     if (hs != NULL && hs->BackendLoaded()) {
       history_service_ = hs;
       Init();
 
       // Found our HistoryService, so stop listening for this notification.
       registrar_.Remove(this,
-                        NotificationType::HISTORY_LOADED,
+                        chrome::NOTIFICATION_HISTORY_LOADED,
                         Source<Profile>(profile_));
     }
   }
 
   // All other notification types that we observe indicate that the history has
   // changed and we need to rebuild.
   need_recreate_ = true;
   CreateMenu();
 }
 
@@ skipping 194 matching lines @@
   [item->menu_item setToolTip:tooltip];
 
   [menu insertItem:item->menu_item.get() atIndex:index];
   menu_item_map_.insert(std::make_pair(item->menu_item.get(), item));
 
   return item->menu_item.get();
 }
 
 void HistoryMenuBridge::Init() {
   const NotificationSource& source = NotificationService::AllSources();
-  registrar_.Add(this, NotificationType::HISTORY_TYPED_URLS_MODIFIED, source);
-  registrar_.Add(this, NotificationType::HISTORY_URL_VISITED, source);
-  registrar_.Add(this, NotificationType::HISTORY_URLS_DELETED, source);
+  registrar_.Add(this, chrome::NOTIFICATION_HISTORY_TYPED_URLS_MODIFIED,
+                 source);
+  registrar_.Add(this, chrome::NOTIFICATION_HISTORY_URL_VISITED, source);
+  registrar_.Add(this, chrome::NOTIFICATION_HISTORY_URLS_DELETED, source);
 }
 
 void HistoryMenuBridge::CreateMenu() {
   // If we're currently running CreateMenu(), wait until it finishes.
   if (create_in_progress_)
     return;
   create_in_progress_ = true;
   need_recreate_ = false;
 
   DCHECK(history_service_);
@@ skipping 97 matching lines @@
 void HistoryMenuBridge::CancelFaviconRequest(HistoryItem* item) {
   DCHECK(item);
   if (item->icon_requested) {
     FaviconService* service =
         profile_->GetFaviconService(Profile::EXPLICIT_ACCESS);
     service->CancelRequest(item->icon_handle);
     item->icon_requested = false;
     item->icon_handle = NULL;
   }
 }