Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5918)

Unified Diff: chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc

Issue 9355059: Renaming virtual setters/getters in UserManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: year Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc
index df3b3f74874dbf10de295dbc3211f5bbaf55a441..635e159c535b90caaaa14fcfdd1a0de640aca76e 100644
--- a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc
@@ -1,4 +1,4 @@
-// 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.
@@ -188,7 +188,7 @@ void ChangePictureOptionsHandler::HandlePageShown(const base::ListValue* args) {
}
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();
@@ -230,8 +230,8 @@ void ChangePictureOptionsHandler::UpdateProfileImage() {
// 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);
}
@@ -247,7 +247,7 @@ void ChangePictureOptionsHandler::HandleSelectImage(const ListValue* args) {
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)) {
@@ -293,7 +293,7 @@ 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,
@@ -302,7 +302,7 @@ void ChangePictureOptionsHandler::FileSelected(const FilePath& path,
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);

Powered by Google App Engine
This is Rietveld 408576698