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

chrome/browser/ui/views/theme_install_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/theme_install_bubble_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/browser/tab_contents/tab_contents.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 "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia.h"
 #include "views/widget/widget.h"
 
 namespace {
 
 // The roundedness of the edges of our bubble.
 static const int kBubbleCornerRadius = 4;
@@ skipping 21 matching lines @@
   // We can't check for the size of tab_contents before we've generated
   // the string and the font that determine the size of the bubble.
   tab_contents->GetContainerBounds(&tab_contents_bounds_);
   if (tab_contents_bounds_.height() < GetPreferredSize().height())
     Close();
 
   // Close when theme has been installed.
   registrar_.Add(
       this,
       chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
-      NotificationService::AllBrowserContextsAndSources());
+      content::NotificationService::AllBrowserContextsAndSources());
 
   // Close when we are installing an extension, not a theme.
   registrar_.Add(
       this,
       chrome::NOTIFICATION_NO_THEME_DETECTED,
-      NotificationService::AllSources());
+      content::NotificationService::AllSources());
   registrar_.Add(
       this,
       chrome::NOTIFICATION_EXTENSION_INSTALLED,
-      NotificationService::AllSources());
+      content::NotificationService::AllSources());
   registrar_.Add(
       this,
       chrome::NOTIFICATION_EXTENSION_INSTALL_ERROR,
-      NotificationService::AllSources());
+      content::NotificationService::AllSources());
 
   // Don't let the bubble overlap the confirm dialog.
   registrar_.Add(
       this,
       chrome::NOTIFICATION_EXTENSION_WILL_SHOW_CONFIRM_DIALOG,
-      NotificationService::AllSources());
+      content::NotificationService::AllSources());
 
   popup_ = new views::Widget;
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
   params.transparent = true;
   params.accept_events = false;
   params.parent = tab_contents->GetNativeView();
   popup_->Init(params);
   popup_->SetContentsView(this);
   popup_->SetOpacity(0xCC);
   Reposition();
@@ skipping 80 matching lines @@
     const content::NotificationDetails& details) {
   Close();
 }
 
 // static
 void ThemeInstallBubbleView::Show(TabContents* tab_contents) {
   ++num_loads_extant_;
   if (num_loads_extant_ < 2)
     new ThemeInstallBubbleView(tab_contents);
 }