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

chrome/browser/ui/gtk/theme_install_bubble_view_gtk.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/gtk/theme_install_bubble_view_gtk.h"
 
 #include <math.h>
 
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/rounded_window.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/gtk/gtk_hig_constants.h"
 #include "ui/base/gtk/gtk_screen_utils.h"
 #include "ui/base/l10n/l10n_util.h"
 
 // Roundedness of bubble.
 static const int kBubbleCornerRadius = 4;
 
 // Padding between border of bubble and text.
 static const int kTextPadding = 8;
@@ skipping 30 matching lines @@
   InitWidgets();
 
   // Close when theme has been installed.
   //
   // TODO(erg): At least for version 1 of multiprofiles, we're still going to
   // listen to AllSources(). Installing a theme blocks the entire UI thread so
   // we won't have another profile trying to install a theme.
   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());
 }
 
 ThemeInstallBubbleViewGtk::~ThemeInstallBubbleViewGtk() {
   gtk_widget_destroy(widget_);
   instance_ = NULL;
 }
 
 void ThemeInstallBubbleViewGtk::InitWidgets() {
   // Widgematically, the bubble is just a label in a popup window.
   widget_ = gtk_window_new(GTK_WINDOW_POPUP);
@@ skipping 89 matching lines @@
             0, M_PI_2);
   cairo_arc(cr, inner_rect.x(), inner_rect.bottom(), inset,
             M_PI_2, M_PI);
 
   cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, kBubbleOpacity);
   cairo_fill(cr);
   cairo_destroy(cr);
 
   return FALSE;
 }