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

Side by Side Diff: chrome/browser/chromeos/display/display_preferences.cc

Issue 375413002: Replace chromeos::UserManager::Get() with chromeos::GetUserManager(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 6 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/display/display_preferences.h" 5 #include "chrome/browser/chromeos/display/display_preferences.h"
6 6
7 #include "ash/display/display_layout_store.h" 7 #include "ash/display/display_layout_store.h"
8 #include "ash/display/display_manager.h" 8 #include "ash/display/display_manager.h"
9 #include "ash/display/display_pref_util.h" 9 #include "ash/display/display_pref_util.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 return ui::COLOR_PROFILE_STANDARD; 91 return ui::COLOR_PROFILE_STANDARD;
92 } 92 }
93 93
94 ash::DisplayManager* GetDisplayManager() { 94 ash::DisplayManager* GetDisplayManager() {
95 return ash::Shell::GetInstance()->display_manager(); 95 return ash::Shell::GetInstance()->display_manager();
96 } 96 }
97 97
98 // Returns true id the current user can write display preferences to 98 // Returns true id the current user can write display preferences to
99 // Local State. 99 // Local State.
100 bool UserCanSaveDisplayPreference() { 100 bool UserCanSaveDisplayPreference() {
101 UserManager* user_manager = UserManager::Get(); 101 UserManager* user_manager = GetUserManager();
102 return user_manager->IsUserLoggedIn() && 102 return user_manager->IsUserLoggedIn() &&
103 (user_manager->IsLoggedInAsRegularUser() || 103 (user_manager->IsLoggedInAsRegularUser() ||
104 user_manager->IsLoggedInAsLocallyManagedUser() || 104 user_manager->IsLoggedInAsLocallyManagedUser() ||
105 user_manager->IsLoggedInAsKioskApp()); 105 user_manager->IsLoggedInAsKioskApp());
106 } 106 }
107 107
108 void LoadDisplayLayouts() { 108 void LoadDisplayLayouts() {
109 PrefService* local_state = g_browser_process->local_state(); 109 PrefService* local_state = g_browser_process->local_state();
110 ash::DisplayLayoutStore* layout_store = GetDisplayManager()->layout_store(); 110 ash::DisplayLayoutStore* layout_store = GetDisplayManager()->layout_store();
111 111
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 const ash::DisplayLayout& layout) { 337 const ash::DisplayLayout& layout) {
338 StoreDisplayLayoutPref(std::make_pair(id1, id2), layout); 338 StoreDisplayLayoutPref(std::make_pair(id1, id2), layout);
339 } 339 }
340 340
341 // Stores the given |power_state|. 341 // Stores the given |power_state|.
342 void StoreDisplayPowerStateForTest(DisplayPowerState power_state) { 342 void StoreDisplayPowerStateForTest(DisplayPowerState power_state) {
343 StoreDisplayPowerState(power_state); 343 StoreDisplayPowerState(power_state);
344 } 344 }
345 345
346 } // namespace chromeos 346 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698