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

Unified Diff: chrome/browser/chromeos/power/power_button_observer.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/chromeos/power/power_button_observer.cc
diff --git a/chrome/browser/chromeos/power/power_button_observer.cc b/chrome/browser/chromeos/power/power_button_observer.cc
index f5c9f942e014c7682c8d7ad7572ac79975c8672d..86a24f2172719e65f89ce6788605d0e41f76a7fe 100644
--- a/chrome/browser/chromeos/power/power_button_observer.cc
+++ b/chrome/browser/chromeos/power/power_button_observer.cc
@@ -39,8 +39,8 @@ PowerButtonObserver::PowerButtonObserver() {
// Tell the controller about the initial state.
const UserManager* user_manager = UserManager::Get();
- bool logged_in = user_manager->user_is_logged_in();
- bool is_guest = logged_in && user_manager->logged_in_user().is_guest();
+ bool logged_in = user_manager->IsUserLoggedIn();
+ bool is_guest = logged_in && user_manager->GetLoggedInUser().is_guest();
controller->OnLoginStateChange(logged_in, is_guest);
const ScreenLocker* locker = ScreenLocker::default_screen_locker();
@@ -57,7 +57,7 @@ void PowerButtonObserver::Observe(int type,
const content::NotificationDetails& details) {
switch (type) {
case chrome::NOTIFICATION_LOGIN_USER_CHANGED: {
- const User* user = &UserManager::Get()->logged_in_user();
+ const User* user = &UserManager::Get()->GetLoggedInUser();
ash::Shell::GetInstance()->power_button_controller()->
OnLoginStateChange(true /* logged_in */, user->is_guest());
break;
« no previous file with comments | « chrome/browser/chromeos/options/wifi_config_view.cc ('k') | chrome/browser/chromeos/proxy_config_service_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698