chrome/browser/chromeos/display/display_preferences.cc - Issue 226183004: Renamed OutputConfigurator to DisplayConfigurator

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/display/display_preferences.cc

Issue 226183004: Renamed OutputConfigurator to DisplayConfigurator (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased Created 6 years, 8 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:

Index: chrome/browser/chromeos/display/display_preferences.cc

diff --git a/chrome/browser/chromeos/display/display_preferences.cc b/chrome/browser/chromeos/display/display_preferences.cc

index 30eac29cb58827c12de4d156c57f7b509d35116a..25a2356da281844bc83f32edb45890943f17cc67 100644

--- a/chrome/browser/chromeos/display/display_preferences.cc

+++ b/chrome/browser/chromeos/display/display_preferences.cc

@@ -283,7 +283,7 @@ void StoreDisplayPowerState(DisplayPowerState power_state) {

void StoreCurrentDisplayPowerState() {

StoreDisplayPowerState(

- ash::Shell::GetInstance()->output_configurator()->power_state());

+ ash::Shell::GetInstance()->display_configurator()->power_state());

}

} // namespace

@@ -326,7 +326,7 @@ void LoadDisplayPreferences(bool first_run_after_boot) {

std::string value = local_state->GetString(prefs::kDisplayPowerState);

chromeos::DisplayPowerState power_state;

if (GetDisplayPowerStateFromString(value, &power_state)) {

- ash::Shell::GetInstance()->output_configurator()->SetInitialDisplayPower(

+ ash::Shell::GetInstance()->display_configurator()->SetInitialDisplayPower(

power_state);

}