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

chrome/browser/ui/views/bookmarks/bookmark_context_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/bookmarks/bookmark_context_menu.h"
 
 #include "base/i18n/rtl.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/common/chrome_notification_types.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.h"
 #include "views/controls/menu/menu_item_view.h"
 #include "views/controls/menu/menu_runner.h"
 #include "views/widget/widget.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // BookmarkContextMenu, public:
 
 BookmarkContextMenu::BookmarkContextMenu(
@@ skipping 12 matching lines @@
       parent_node_(parent),
       observer_(NULL),
       close_on_remove_(close_on_remove) {
   controller_->BuildMenu();
 }
 
 BookmarkContextMenu::~BookmarkContextMenu() {
 }
 
 void BookmarkContextMenu::RunMenuAt(const gfx::Point& point) {
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_BOOKMARK_CONTEXT_MENU_SHOWN,
       content::Source<BookmarkContextMenu>(this),
-      NotificationService::NoDetails());
+      content::NotificationService::NoDetails());
   // width/height don't matter here.
   if (menu_runner_->RunMenuAt(
           parent_widget_, NULL, gfx::Rect(point.x(), point.y(), 0, 0),
           views::MenuItemView::TOPLEFT,
           (views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::IS_NESTED)) ==
       views::MenuRunner::MENU_DELETED)
     return;
 }
 
 void BookmarkContextMenu::SetPageNavigator(PageNavigator* navigator) {
@@ skipping 45 matching lines @@
 void BookmarkContextMenu::WillRemoveBookmarks(
     const std::vector<const BookmarkNode*>& bookmarks) {
   if (observer_)
     observer_->WillRemoveBookmarks(bookmarks);
 }
 
 void BookmarkContextMenu::DidRemoveBookmarks() {
   if (observer_)
     observer_->DidRemoveBookmarks();
 }