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

chrome/browser/ui/views/wrench_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/views/wrench_menu.h"
 
 #include <cmath>
 
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/user_metrics.h"
+#include "content/common/content_notification_types.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 #include "content/common/notification_source.h"
-#include "content/common/notification_type.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/skia_util.h"
 #include "views/background.h"
@@ skipping 398 matching lines @@
     fullscreen_button_->set_background(
         new MenuButtonBackground(MenuButtonBackground::SINGLE_BUTTON));
     fullscreen_button_->SetAccessibleName(
         GetAccessibleNameForWrenchMenuItem(
             menu_model, fullscreen_index, IDS_ACCNAME_FULLSCREEN));
     AddChildView(fullscreen_button_);
 
     UpdateZoomControls();
 
     registrar_.Add(
-        this, NotificationType::ZOOM_LEVEL_CHANGED,
+        this, content::NOTIFICATION_ZOOM_LEVEL_CHANGED,
         Source<HostZoomMap>(menu->browser_->profile()->GetHostZoomMap()));
   }
 
   gfx::Size GetPreferredSize() {
     // The increment/decrement button are forced to the same width.
     int button_width = std::max(increment_button_->GetPreferredSize().width(),
                                 decrement_button_->GetPreferredSize().width());
     int fullscreen_width = fullscreen_button_->GetPreferredSize().width();
     // Returned height doesn't matter as MenuItemView forces everything to the
     // height of the menuitemview.
@@ skipping 29 matching lines @@
   virtual void ButtonPressed(views::Button* sender, const views::Event& event) {
     if (sender->tag() == fullscreen_index_) {
       menu_->CancelAndEvaluate(menu_model_, sender->tag());
     } else {
       // Zoom buttons don't close the menu.
       menu_model_->ActivatedAt(sender->tag());
     }
   }
 
   // NotificationObserver:
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) {
-    DCHECK_EQ(NotificationType::ZOOM_LEVEL_CHANGED, type.value);
+    DCHECK_EQ(content::NOTIFICATION_ZOOM_LEVEL_CHANGED, type);
     UpdateZoomControls();
   }
 
  private:
   void UpdateZoomControls() {
     bool enable_increment = false;
     bool enable_decrement = false;
     TabContents* selected_tab = menu_->browser_->GetSelectedTabContents();
     int zoom = 100;
     if (selected_tab)
@@ skipping 350 matching lines @@
   model->AddObserver(this);
   bookmark_menu_delegate_.reset(
       new BookmarkMenuDelegate(browser_->profile(),
                                NULL,
                                browser_->window()->GetNativeHandle(),
                                first_bookmark_command_id_));
   bookmark_menu_delegate_->Init(
       this, bookmark_menu_, model->GetBookmarkBarNode(), 0,
       BookmarkMenuDelegate::SHOW_OTHER_FOLDER);
 }