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

chrome/browser/ui/cocoa/theme_install_bubble_view.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 <Cocoa/Cocoa.h>
 
 #import "chrome/browser/ui/cocoa/theme_install_bubble_view.h"
 
+#include "base/logging.h"
 #include "base/memory/scoped_nsobject.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_mac.h"
 
 namespace {
 
 // The alpha of the bubble.
 static const float kBubbleAlpha = 0.75;
 
 // The roundedness of the edges of our bubble.
 static const int kBubbleCornerRadius = 4;
@@ skipping 35 matching lines @@
 
   NSView* parent_view = [window contentView];
   NSRect parent_bounds = [parent_view bounds];
   if (parent_bounds.size.height < [cocoa_view_ preferredSize].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());
 
   // Add the view.
   [cocoa_view_ setFrame:parent_bounds];
   [cocoa_view_ setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
   [parent_view addSubview:cocoa_view_
                positioned:NSWindowAbove
                relativeTo:nil];
   [cocoa_view_ layout];
 }
 
@@ skipping 82 matching lines @@
 
   [[[NSColor blackColor] colorWithAlphaComponent:kBubbleAlpha] set];
   [[NSBezierPath bezierPathWithRoundedRect:grayRect_
                                    xRadius:kBubbleCornerRadius
                                    yRadius:kBubbleCornerRadius] fill];
 
   [message_.get() drawInRect:textRect_];
 }
 
 @end