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

chrome/browser/chromeos/login/wizard_accessibility_helper.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/wizard_accessibility_helper.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/accessibility_util.h"
 #include "chrome/browser/extensions/extension_accessibility_api.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_registrar.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.h"
 #include "views/accelerator.h"
 #include "views/view.h"
 
 namespace chromeos {
 
 scoped_ptr<views::Accelerator> WizardAccessibilityHelper::accelerator_;
 
 // static
@@ skipping 24 matching lines @@
     // SetAccessibilityEnabled(true) fully enables accessibility. Init() is
     // necessary during startup when the global accessibility pref is set but
     // the notifications are not registered.
     SetAccessibilityEnabled(true);
   }
 }
 
 void WizardAccessibilityHelper::RegisterNotifications() {
   registrar_.Add(accessibility_handler_.get(),
                  chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_FOCUSED,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
   registrar_.Add(accessibility_handler_.get(),
                  chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_ACTION,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
   registrar_.Add(accessibility_handler_.get(),
                  chrome::NOTIFICATION_ACCESSIBILITY_TEXT_CHANGED,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
   registrar_.Add(accessibility_handler_.get(),
                  chrome::NOTIFICATION_ACCESSIBILITY_MENU_OPENED,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
   registrar_.Add(accessibility_handler_.get(),
                  chrome::NOTIFICATION_ACCESSIBILITY_MENU_CLOSED,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
   registered_notifications_ = true;
 }
 
 void WizardAccessibilityHelper::UnregisterNotifications() {
   if (!registered_notifications_)
     return;
   registrar_.RemoveAll();
   registered_notifications_ = false;
 }
 
@@ skipping 21 matching lines @@
     if (registered_notifications_)
       UnregisterNotifications();
   }
 }
 
 void WizardAccessibilityHelper::SetAccessibilityEnabled(bool enabled) {
   accessibility::EnableAccessibility(enabled, NULL);
 }
 
 }  // namespace chromeos