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

chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_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/bookmarks/bookmark_bubble_controller.h"
 
 #include "base/mac/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
 #include "content/browser/user_metrics.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 
 // Simple class to watch for tab creation/destruction and close the bubble.
 // Bridge between Chrome-style notifications and ObjC-style notifications.
 class BookmarkBubbleNotificationBridge : public content::NotificationObserver {
  public:
   BookmarkBubbleNotificationBridge(BookmarkBubbleController* controller,
                                    SEL selector);
   virtual ~BookmarkBubbleNotificationBridge() {}
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details);
  private:
   content::NotificationRegistrar registrar_;
   BookmarkBubbleController* controller_;  // weak; owns us.
   SEL selector_;   // SEL sent to controller_ on notification.
 };
 
 BookmarkBubbleNotificationBridge::BookmarkBubbleNotificationBridge(
   BookmarkBubbleController* controller, SEL selector)
     : controller_(controller), selector_(selector) {
   // registrar_ will automatically RemoveAll() when destroyed so we
   // don't need to do so explicitly.
   registrar_.Add(this, content::NOTIFICATION_TAB_CONTENTS_CONNECTED,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
   registrar_.Add(this, content::NOTIFICATION_TAB_CLOSED,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
 }
 
 // At this time all notifications instigate the same behavior (go
 // away) so we don't bother checking which notification came in.
 void BookmarkBubbleNotificationBridge::Observe(
   int type,
   const content::NotificationSource& source,
   const content::NotificationDetails& details) {
   [controller_ performSelector:selector_ withObject:controller_];
 }
@@ skipping 356 matching lines @@
   NSInteger idx = [menu indexOfItemWithRepresentedObject:parentValue];
   DCHECK(idx != -1);
   [folderPopUpButton_ selectItemAtIndex:idx];
 }
 
 - (NSPopUpButton*)folderPopUpButton {
   return folderPopUpButton_;
 }
 
 @end  // implementation BookmarkBubbleController(ExposedForUnitTesting)