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

chrome/browser/chromeos/login/views_oobe_display.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 <vector>
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/enrollment/views_enterprise_enrollment_screen_actor.h"
 #include "chrome/browser/chromeos/login/views_eula_screen_actor.h"
 #include "chrome/browser/chromeos/login/views_network_screen_actor.h"
 #include "chrome/browser/chromeos/login/views_oobe_display.h"
 #include "chrome/browser/chromeos/login/views_update_screen_actor.h"
 #include "chrome/browser/chromeos/login/views_user_image_screen_actor.h"
 #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/common/chrome_notification_types.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "views/view.h"
 #include "views/widget/widget.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include "chrome/browser/chromeos/wm_ipc.h"
 #endif
 
 namespace chromeos {
 
 namespace {
@@ skipping 31 matching lines @@
     AddAccelerator(accel_image_screen_);
     AddAccelerator(accel_eula_screen_);
     AddAccelerator(accel_register_screen_);
     AddAccelerator(accel_enterprise_enrollment_screen_);
 #endif
     AddAccelerator(accel_toggle_accessibility_);
     AddAccelerator(accel_cancel_update_);
   }
 
   ~ContentView() {
-    NotificationService::current()->Notify(
+    content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_WIZARD_CONTENT_VIEW_DESTROYED,
-        NotificationService::AllSources(),
-        NotificationService::NoDetails());
+        content::NotificationService::AllSources(),
+        content::NotificationService::NoDetails());
   }
 
   bool AcceleratorPressed(const views::Accelerator& accel) {
     WizardController* controller = WizardController::default_controller();
     if (!controller)
       return false;
 
     if (accel == accel_toggle_accessibility_) {
       chromeos::WizardAccessibilityHelper::GetInstance()->ToggleAccessibility();
     } else if (accel == accel_cancel_update_) {
@@ skipping 190 matching lines @@
 
 void ViewsOobeDisplay::SetScreenSize(const gfx::Size &screen_size) {
   screen_size_ = screen_size;
 }
 
 void ViewsOobeDisplay::SetScreenObserver(ScreenObserver* screen_observer) {
   screen_observer_ = screen_observer;
 }
 
 }  // namespace chromeos