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

chrome/browser/ui/views/bookmarks/bookmark_bubble_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_bubble_view.h"
 
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/views/bubble/bubble.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/browser/user_metrics.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/label.h"
 #include "views/controls/link.h"
 #include "views/controls/textfield/textfield.h"
@@ skipping 65 matching lines @@
   // |bubble_| can be set to NULL in BubbleClosing when we close the bubble
   // asynchronously. However, that can happen during the Show call above if the
   // window loses activation while we are getting to ready to show the bubble,
   // so we must check to make sure we still have a valid bubble before
   // proceeding.
   if (!bookmark_bubble_)
     return;
   bookmark_bubble_->set_bubble(bubble);
   bubble->SizeToContents();
   GURL url_ptr(url);
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_BOOKMARK_BUBBLE_SHOWN,
       content::Source<Profile>(profile->GetOriginalProfile()),
       content::Details<GURL>(&url_ptr));
   bookmark_bubble_->BubbleShown();
 }
 
 // static
 bool BookmarkBubbleView::IsShowing() {
   return bookmark_bubble_ != NULL;
 }
@@ skipping 193 matching lines @@
     apply_edits_ = false;
   }
 
   // We have to reset |bubble_| here, not in our destructor, because we'll be
   // destroyed asynchronously and the shown state will be checked before then.
   DCHECK(bookmark_bubble_ == this);
   bookmark_bubble_ = NULL;
 
   if (delegate_)
     delegate_->BubbleClosing(bubble, closed_by_escape);
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_BOOKMARK_BUBBLE_HIDDEN,
       content::Source<Profile>(profile_->GetOriginalProfile()),
-      NotificationService::NoDetails());
+      content::NotificationService::NoDetails());
 }
 
 bool BookmarkBubbleView::CloseOnEscape() {
   return delegate_ ? delegate_->CloseOnEscape() : true;
 }
 
 bool BookmarkBubbleView::FadeInOnShow() {
   return false;
 }
 
@@ skipping 75 matching lines @@
       const BookmarkNode* new_parent =
           parent_model_.GetNodeAt(parent_combobox_->selected_item());
       if (new_parent != node->parent()) {
         UserMetrics::RecordAction(
             UserMetricsAction("BookmarkBubble_ChangeParent"));
         model->Move(node, new_parent, new_parent->child_count());
       }
     }
   }
 }