ash/wm/power_button_controller.cc - Issue 192483007: Move chromeos/display/* to ui/display/chromeos

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 192483007: Move chromeos/display/* to ui/display/chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Include display.gyp into ChromeOS builds only Created 6 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:

Index: ash/wm/power_button_controller.cc

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

index 899c141ec2bcd077d5cf85c9167c64ed99aefe53..984890584284383b4714df8ece4d1a4b07158418 100644

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

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

@@ -117,11 +117,11 @@ void PowerButtonController::OnLockButtonEvent(

#if defined(OS_CHROMEOS) && defined(USE_X11)

void PowerButtonController::OnDisplayModeChanged(

- const std::vector<chromeos::OutputConfigurator::OutputSnapshot>& outputs) {

+ const std::vector<ui::OutputConfigurator::OutputSnapshot>& outputs) {

bool internal_display_off = false;

bool external_display_on = false;

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

- const chromeos::OutputConfigurator::OutputSnapshot& output = outputs[i];

+ const ui::OutputConfigurator::OutputSnapshot& output = outputs[i];

if (output.type == ui::OUTPUT_TYPE_INTERNAL) {

if (!output.current_mode)

internal_display_off = true;