Make NotificationService an interface in the content namespace, and switch callers to use it. Mov...

chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.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.
 
 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"
 
 #include "base/basictypes.h"
 #include "base/mac/mac_util.h"
 #include "base/string16.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #import "chrome/browser/app_controller_mac.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/accelerators_cocoa.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"
 #import "chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #import "chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view.h"
 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/browser/user_metrics.h"
 #include "content/public/browser/notification_observer.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/accelerator_cocoa.h"
 #include "ui/base/models/menu_model.h"
 
 @interface WrenchMenuController (Private)
 - (void)createModel;
@@ skipping 22 matching lines @@
       return true;
     }
     return false;
   }
 };
 
 class ZoomLevelObserver : public content::NotificationObserver {
  public:
   explicit ZoomLevelObserver(WrenchMenuController* controller)
       : controller_(controller) {
-    registrar_.Add(this, content::NOTIFICATION_ZOOM_LEVEL_CHANGED,
-                   NotificationService::AllBrowserContextsAndSources());
+    registrar_.Add(
+        this, content::NOTIFICATION_ZOOM_LEVEL_CHANGED,
+        content::NotificationService::AllBrowserContextsAndSources());
   }
 
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) {
     DCHECK_EQ(type, content::NOTIFICATION_ZOOM_LEVEL_CHANGED);
     WrenchMenuModel* wrenchMenuModel = [controller_ wrenchMenuModel];
     if (wrenchMenuModel->browser()->profile()->GetHostZoomMap() !=
         content::Source<HostZoomMap>(source).ptr()) {
       return;
@@ skipping 249 matching lines @@
     controller_ = controller;
   }
   return self;
 }
 
 - (IBAction)dispatchWrenchMenuCommand:(id)sender {
   [controller_ dispatchWrenchMenuCommand:sender];
 }
 
 @end  // @implementation WrenchMenuButtonViewController