ash/wm/power_button_controller.cc - Issue 1019623002: Remove DisplayState from the public interface for 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: ash/wm/power_button_controller.cc

Issue 1019623002: Remove DisplayState from the public interface for DisplayConfigurator (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update ash_unittests Created 5 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

« ash/wm/lock_state_controller_unittest.cc ('K') | « ash/wm/lock_state_controller_unittest.cc ('k') | ui/display/chromeos/display_configurator.h » ('j') | ui/display/chromeos/display_configurator.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/wm/power_button_controller.cc

diff --git a/ash/wm/power_button_controller.cc b/ash/wm/power_button_controller.cc

index 5d70803b134f82e10f7fd829e49349aaedc48a6b..65906ccbb2885aeeb3db5d6d50b14ab059552224 100644

--- a/ash/wm/power_button_controller.cc

+++ b/ash/wm/power_button_controller.cc

@@ -146,11 +146,11 @@ void PowerButtonController::OnDisplayModeChanged(

bool internal_display_off = false;

bool external_display_on = false;

for (size_t i = 0; i < display_states.size(); ++i) {

oshima 2015/03/18 23:02:45 ditto

dnicoara 2015/03/19 14:47:36 Done.

- const ui::DisplayConfigurator::DisplayState& state = display_states[i];

- if (state.display->type() == ui::DISPLAY_CONNECTION_TYPE_INTERNAL) {

- if (!state.display->current_mode())

+ const ui::DisplaySnapshot& display = *display_states[i];

+ if (display.type() == ui::DISPLAY_CONNECTION_TYPE_INTERNAL) {

+ if (!display.current_mode())

internal_display_off = true;

- } else if (state.display->current_mode()) {

+ } else if (display.current_mode()) {

external_display_on = true;

}