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

chrome/browser/chromeos/status/input_method_menu.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/status/input_method_menu.h"
 
 #include <string>
 #include <vector>
 
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/user_metrics.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "views/controls/menu/menu_model_adapter.h"
 #include "views/controls/menu/menu_runner.h"
 #include "views/controls/menu/submenu_view.h"
 #include "views/widget/widget.h"
 
@@ skipping 126 matching lines @@
         prefs::kLanguageCurrentInputMethod, pref_service, this);
   }
 
   InputMethodManager* manager = InputMethodManager::GetInstance();
   if (screen_mode_ == StatusAreaHost::kViewsLoginMode ||
       screen_mode_ == StatusAreaHost::kWebUILoginMode) {
     // This button is for the login screen.
     manager->AddPreLoginPreferenceObserver(this);
     registrar_.Add(this,
                    chrome::NOTIFICATION_LOGIN_USER_CHANGED,
-                   NotificationService::AllSources());
+                   content::NotificationService::AllSources());
   } else if (screen_mode_ == StatusAreaHost::kBrowserMode) {
     manager->AddPostLoginPreferenceObserver(this);
   }
 
   // AddObserver() should be called after AddXXXLoginPreferenceObserver. This is
   // because when the function is called FirstObserverIsAdded might be called
   // back, and FirstObserverIsAdded might then might call ChangeInputMethod() in
   // InputMethodManager. We have to prevent the manager function from calling
   // callback functions like InputMethodChanged since they touch (yet
   // uninitialized) UI elements.
@@ skipping 540 matching lines @@
   if (screen_mode_ == StatusAreaHost::kViewsLoginMode ||
       screen_mode_ == StatusAreaHost::kWebUILoginMode) {
     manager->RemovePreLoginPreferenceObserver(this);
   } else if (screen_mode_ == StatusAreaHost::kBrowserMode) {
     manager->RemovePostLoginPreferenceObserver(this);
   }
   manager->RemoveObserver(this);
 }
 
 }  // namespace chromeos