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

chrome/browser/ui/views/bookmarks/bookmark_bar_view.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/views/bookmarks/bookmark_bar_view.h"
 
 #include <algorithm>
 #include <limits>
 #include <set>
 #include <vector>
@@ skipping 12 matching lines @@
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_context_menu.h"
 #include "chrome/browser/ui/views/event_utils.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/tab_contents/page_navigator.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/user_metrics.h"
 #include "content/common/notification_service.h"
 #include "content/common/page_transition_types.h"
@@ skipping 378 matching lines @@
   profile_ = profile;
 
   if (model_)
     model_->RemoveObserver(this);
 
   // Disable the other bookmarked button, we'll re-enable when the model is
   // loaded.
   other_bookmarked_button_->SetEnabled(false);
 
   Source<Profile> ns_source(profile_->GetOriginalProfile());
-  registrar_.Add(this, NotificationType::BOOKMARK_BUBBLE_SHOWN, ns_source);
-  registrar_.Add(this, NotificationType::BOOKMARK_BUBBLE_HIDDEN, ns_source);
+  registrar_.Add(this, chrome::NOTIFICATION_BOOKMARK_BUBBLE_SHOWN, ns_source);
+  registrar_.Add(this, chrome::NOTIFICATION_BOOKMARK_BUBBLE_HIDDEN, ns_source);
 
   // Remove any existing bookmark buttons.
   while (GetBookmarkButtonCount())
     delete GetChildViewAt(0);
 
   model_ = profile_->GetBookmarkModel();
   if (model_) {
     model_->AddObserver(this);
     if (model_->IsLoaded())
       Loaded(model_);
@@ skipping 695 matching lines @@
   PageNavigator* navigator =
       browser() ? browser()->GetSelectedTabContents() : NULL;
   bool close_on_remove =
       (parent == profile_->GetBookmarkModel()->other_node() &&
        parent->child_count() == 1);
   BookmarkContextMenu controller(GetWidget()->GetNativeWindow(), profile_,
                                  navigator, parent, nodes, close_on_remove);
   controller.RunMenuAt(p);
 }
 
-void BookmarkBarView::Observe(NotificationType type,
+void BookmarkBarView::Observe(int type,
                               const NotificationSource& source,
                               const NotificationDetails& details) {
   DCHECK(profile_);
-  switch (type.value) {
-    case NotificationType::BOOKMARK_BUBBLE_SHOWN: {
+  switch (type) {
+    case chrome::NOTIFICATION_BOOKMARK_BUBBLE_SHOWN: {
       StopThrobbing(true);
       GURL url = *(Details<GURL>(details).ptr());
       const BookmarkNode* node = model_->GetMostRecentlyAddedNodeForURL(url);
       if (!node)
         return;  // Generally shouldn't happen.
       StartThrobbing(node, false);
       break;
     }
-    case NotificationType::BOOKMARK_BUBBLE_HIDDEN:
+    case chrome::NOTIFICATION_BOOKMARK_BUBBLE_HIDDEN:
       StopThrobbing(false);
       break;
 
     default:
       NOTREACHED();
       break;
   }
 }
 
 void BookmarkBarView::Init() {
@@ skipping 581 matching lines @@
               (1 - size_animation_->GetCurrentValue())));
     } else {
       prefsize.set_height(
           static_cast<int>(
               browser_defaults::kBookmarkBarHeight *
               size_animation_->GetCurrentValue()));
     }
   }
   return prefsize;
 }