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

chrome/browser/chromeos/login/user_manager.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/user_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
@@ skipping 22 matching lines @@
 #include "chrome/browser/chromeos/login/ownership_service.h"
 #include "chrome/browser/chromeos/user_cros_settings_provider.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/browser/browser_thread.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/codec/png_codec.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include "chrome/browser/chromeos/wm_ipc.h"
 #endif
 
 namespace chromeos {
 
 namespace {
@@ skipping 169 matching lines @@
   DictionaryPrefUpdate images_update(local_state, kUserImages);
   base::DictionaryValue* image_properties = new base::DictionaryValue();
   image_properties->Set(kImagePathNodeName, new StringValue(image_path));
   image_properties->Set(kImageIndexNodeName,
                         new base::FundamentalValue(image_index));
   images_update->SetWithoutPathExpansion(username, image_properties);
   DVLOG(1) << "Saving path to user image in Local State.";
   local_state->SavePersistentPrefs();
 
   NotifyLocalStateChanged();
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED,
       content::Source<UserManager>(this),
       content::Details<const User>(&logged_in_user_));
 }
 
 void UserManager::SaveImageToFile(const SkBitmap& image,
                                   const FilePath& image_path,
                                   const std::string& username,
                                   int image_index) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
@@ skipping 23 matching lines @@
   if (!file_util::Delete(image_path, false)) {
     LOG(ERROR) << "Failed to remove user image.";
     return;
   }
 }
 
 void UserManager::UpdateOwnership(bool is_owner) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   set_current_user_is_owner(is_owner);
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_OWNERSHIP_CHECKED,
-      NotificationService::AllSources(),
-      NotificationService::NoDetails());
+      content::NotificationService::AllSources(),
+      content::NotificationService::NoDetails());
   if (is_owner) {
     // Also update cached value.
     UserCrosSettingsProvider::UpdateCachedOwner(logged_in_user_.email());
   }
 }
 
 void UserManager::CheckOwnership() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   bool is_owner = OwnershipService::GetSharedInstance()->CurrentUserIsOwner();
   VLOG(1) << "Current user " << (is_owner ? "is owner" : "is not owner");
@@ skipping 392 matching lines @@
   VLOG(1) << "Downloaded profile image for logged-in user.";
 
   std::string current_image_data_url =
       web_ui_util::GetImageDataUrl(logged_in_user_.image());
   std::string new_image_data_url =
       web_ui_util::GetImageDataUrl(image);
   if (current_image_data_url != new_image_data_url) {
     VLOG(1) << "Updating profile image for logged-in user";
     SetLoggedInUserImage(image, User::kProfileImageIndex);
     SaveUserImage(logged_in_user_.email(), image, User::kProfileImageIndex);
-    NotificationService::current()->Notify(
+    content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_PROFILE_IMAGE_UPDATED,
         content::Source<UserManager>(this),
         content::Details<const UserManager::User>(&logged_in_user()));
   }
 }
 
 bool UserManager::IsLoggedInAsGuest() const {
   return logged_in_user().email() == kGuestUser;
 }
 
 // Private constructor and destructor. Do nothing.
 UserManager::UserManager()
     : ALLOW_THIS_IN_INITIALIZER_LIST(image_loader_(new UserImageLoader(this))),
       offline_login_(false),
       current_user_is_owner_(false),
       current_user_is_new_(false),
       user_is_logged_in_(false),
       last_image_set_async_(false) {
   registrar_.Add(this, chrome::NOTIFICATION_OWNER_KEY_FETCH_ATTEMPT_SUCCEEDED,
-      NotificationService::AllSources());
+      content::NotificationService::AllSources());
 }
 
 UserManager::~UserManager() {
   image_loader_->set_delegate(NULL);
 }
 
 FilePath UserManager::GetImagePathForUser(const std::string& username) {
   std::string filename = username + ".png";
   FilePath user_data_dir;
   PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
@@ skipping 27 matching lines @@
   std::string local_user_pin;
   CrosLibrary::Get()->GetCryptohomeLibrary()->Pkcs11GetTpmTokenInfo(
       &local_token_name, &local_user_pin);
   if (token_name)
     *token_name = local_token_name;
   if (user_pin)
     *user_pin = local_user_pin;
 }
 
 void UserManager::NotifyOnLogin() {
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_LOGIN_USER_CHANGED,
       content::Source<UserManager>(this),
       content::Details<const User>(&logged_in_user_));
 
   chromeos::input_method::InputMethodManager::GetInstance()->
       SetDeferImeStartup(false);
   // Shut down the IME so that it will reload the user's settings.
   chromeos::input_method::InputMethodManager::GetInstance()->
       StopInputMethodDaemon();
 
@@ skipping 56 matching lines @@
     observer_list_,
     LocalStateChanged(this));
 }
 
 void UserManager::DownloadProfileImage() {
   profile_image_downloader_.reset(new ProfileImageDownloader(this));
   profile_image_downloader_->Start();
 }
 
 }  // namespace chromeos