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

chrome/browser/chromeos/login/base_login_display_host.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/chromeos/login/base_login_display_host.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/threading/thread_restrictions.h"
@@ skipping 13 matching lines @@
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/views_login_display_host.h"
 #include "chrome/browser/chromeos/login/webui_login_display_host.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/mobile_config.h"
 #include "chrome/browser/chromeos/system/timezone_settings.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "unicode/timezone.h"
 
 // TODO(altimofeev): move to ViewsLoginDisplayHost
 #include "chrome/browser/chromeos/login/views_oobe_display.h"
 
 #if defined(TOOLKIT_USES_GTK)
@@ skipping 54 matching lines @@
 
 BaseLoginDisplayHost::BaseLoginDisplayHost(const gfx::Rect& background_bounds)
     : background_bounds_(background_bounds) {
   // We need to listen to APP_EXITING but not APP_TERMINATING because
   // APP_TERMINATING will never be fired as long as this keeps ref-count.
   // APP_EXITING is safe here because there will be no browser instance that
   // will block the shutdown.
   registrar_.Add(
       this,
       content::NOTIFICATION_APP_EXITING,
-      NotificationService::AllSources());
+      content::NotificationService::AllSources());
   DCHECK(default_host_ == NULL);
   default_host_ = this;
 
   // Add a reference count so the message loop won't exit when other
   // message loop clients (e.g. menus) do.
   g_browser_process->AddRefModule();
 }
 
 BaseLoginDisplayHost::~BaseLoginDisplayHost() {
   // A browser should already exist when destructor is called since
@@ skipping 241 matching lines @@
   // user has changed to during OOBE.
   if (!timezone_name.empty()) {
     icu::TimeZone* timezone = icu::TimeZone::createTimeZone(
         icu::UnicodeString::fromUTF8(timezone_name));
     CHECK(timezone) << "Timezone could not be set for " << timezone_name;
     chromeos::system::TimezoneSettings::GetInstance()->SetTimezone(*timezone);
   }
 }
 
 }  // namespace browser