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

chrome/browser/extensions/extension_install_ui.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/extensions/extension_install_ui.h"
 
 #include <map>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 15 matching lines @@
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/extensions/url_pattern.h"
 #include "chrome/common/url_constants.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 static const int kTitleIds[ExtensionInstallUI::NUM_PROMPT_TYPES] = {
   IDS_EXTENSION_INSTALL_PROMPT_TITLE,
   IDS_EXTENSION_INLINE_INSTALL_PROMPT_TITLE,
   IDS_EXTENSION_RE_ENABLE_PROMPT_TITLE,
@@ skipping 269 matching lines @@
 }
 
 void ExtensionInstallUI::OnImageLoaded(
     SkBitmap* image, const ExtensionResource& resource, int index) {
   SetIcon(image);
 
   switch (prompt_type_) {
     case PERMISSIONS_PROMPT:
     case RE_ENABLE_PROMPT:
     case INSTALL_PROMPT: {
-      NotificationService* service = NotificationService::current();
+      content::NotificationService* service =
+          content::NotificationService::current();
       service->Notify(chrome::NOTIFICATION_EXTENSION_WILL_SHOW_CONFIRM_DIALOG,
           content::Source<ExtensionInstallUI>(this),
-          NotificationService::NoDetails());
+          content::NotificationService::NoDetails());
 
       Prompt prompt(prompt_type_);
       prompt.SetPermissions(permissions_->GetWarningMessages());
       ShowExtensionInstallDialog(
           profile_, delegate_, extension_, &icon_, prompt);
       break;
     }
     default:
       NOTREACHED() << "Unknown message";
       break;
   }
 }
 
 // static
 void ExtensionInstallUI::OpenAppInstalledNTP(Browser* browser,
                                              const std::string& app_id) {
   browser::NavigateParams params =
       browser->GetSingletonTabNavigateParams(GURL(chrome::kChromeUINewTabURL));
   browser::Navigate(&params);
 
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_APP_INSTALLED_TO_NTP,
       content::Source<TabContents>(params.target_contents->tab_contents()),
       content::Details<const std::string>(&app_id));
 }
 
 // static
 void ExtensionInstallUI::DisableFailureUIForTests() {
   disable_failure_ui_for_tests = true;
 }
 
@@ skipping 59 matching lines @@
     bool previous_using_native_theme) {
   Profile* profile = tab_contents->profile();
   return new ThemeInstalledInfoBarDelegate(
       tab_contents->infobar_tab_helper(),
       profile->GetExtensionService(),
       ThemeServiceFactory::GetForProfile(profile),
       new_theme,
       previous_theme_id,
       previous_using_native_theme);
 }