Renaming virtual setters/getters in UserManager.

chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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/ui/webui/options/chromeos/change_picture_options_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
@@ skipping 169 matching lines @@
   DCHECK(args && args->empty());
   // TODO(ivankr): If user opens settings and goes to Change Picture page right
   // after the check started |HandlePageInitialized| has been completed,
   // |CheckCameraPresence| will be called twice, should be throttled.
   CheckCameraPresence();
   SendSelectedImage();
   UpdateProfileImage();
 }
 
 void ChangePictureOptionsHandler::SendSelectedImage() {
-  const User& user = UserManager::Get()->logged_in_user();
+  const User& user = UserManager::Get()->GetLoggedInUser();
   DCHECK(!user.email().empty());
 
   previous_image_index_ = user.image_index();
   switch (previous_image_index_) {
     case User::kExternalImageIndex: {
       // User has image from camera/file, record it and add to the image list.
       previous_image_ = user.image();
       previous_image_data_url_ = web_ui_util::GetImageDataUrl(previous_image_);
       web_ui()->CallJavascriptFunction("ChangePictureOptions.setOldImage");
       break;
@@ skipping 21 matching lines @@
   web_ui()->CallJavascriptFunction("ChangePictureOptions.setProfileImage",
                                    data_url, select);
 }
 
 void ChangePictureOptionsHandler::UpdateProfileImage() {
   UserManager* user_manager = UserManager::Get();
 
   // If we have a downloaded profile image and haven't sent it in
   // |SendSelectedImage|, send it now (without selecting).
   if (previous_image_index_ != User::kProfileImageIndex &&
-      !user_manager->downloaded_profile_image().empty())
-    SendProfileImage(user_manager->downloaded_profile_image(), false);
+      !user_manager->DownloadedProfileImage().empty())
+    SendProfileImage(user_manager->DownloadedProfileImage(), false);
 
   user_manager->DownloadProfileImage(kProfileDownloadReason);
 }
 
 void ChangePictureOptionsHandler::HandleSelectImage(const ListValue* args) {
   std::string image_url;
   if (!args ||
       args->GetSize() != 1 ||
       !args->GetString(0, &image_url)) {
     NOTREACHED();
     return;
   }
   DCHECK(!image_url.empty());
 
   UserManager* user_manager = UserManager::Get();
-  const User& user = user_manager->logged_in_user();
+  const User& user = user_manager->GetLoggedInUser();
   int image_index = User::kInvalidImageIndex;
 
   if (StartsWithASCII(image_url, chrome::kChromeUIUserImageURL, false)) {
     // Image from file/camera uses kChromeUIUserImageURL as URL while
     // current profile image always has a full data URL.
     // This way transition from (current profile image) to
     // (profile image, current image from file) is easier.
 
     DCHECK(!previous_image_.empty());
     user_manager->SaveUserImage(user.email(), previous_image_);
@@ skipping 25 matching lines @@
                                 kHistogramImagesCount);
       VLOG(1) << "Selected profile image";
     }
   }
 }
 
 void ChangePictureOptionsHandler::FileSelected(const FilePath& path,
                                                int index,
                                                void* params) {
   UserManager* user_manager = UserManager::Get();
-  user_manager->SaveUserImageFromFile(user_manager->logged_in_user().email(),
+  user_manager->SaveUserImageFromFile(user_manager->GetLoggedInUser().email(),
                                       path);
   UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
                             kHistogramImageFromFile,
                             kHistogramImagesCount);
 }
 
 void ChangePictureOptionsHandler::OnPhotoAccepted(const SkBitmap& photo) {
   UserManager* user_manager = UserManager::Get();
-  user_manager->SaveUserImage(user_manager->logged_in_user().email(), photo);
+  user_manager->SaveUserImage(user_manager->GetLoggedInUser().email(), photo);
   UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
                             kHistogramImageFromCamera,
                             kHistogramImagesCount);
 }
 
 void ChangePictureOptionsHandler::CheckCameraPresence() {
   CameraDetector::StartPresenceCheck(
       base::Bind(&ChangePictureOptionsHandler::OnCameraPresenceCheckDone,
                  weak_factory_.GetWeakPtr()));
 }
@@ skipping 22 matching lines @@
 
 gfx::NativeWindow ChangePictureOptionsHandler::GetBrowserWindow() const {
   Browser* browser =
       BrowserList::FindBrowserWithProfile(Profile::FromWebUI(web_ui()));
   if (!browser)
     return NULL;
   return browser->window()->GetNativeHandle();
 }
 
 }  // namespace chromeos