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

Side by Side 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 unified diff | Download patch
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 "ash/wm/power_button_controller.h" 5 #include "ash/wm/power_button_controller.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/session/session_state_delegate.h" 8 #include "ash/session/session_state_delegate.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/shell_window_ids.h" 10 #include "ash/shell_window_ids.h"
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 volume_down_pressed_ = event->type() == ui::ET_KEY_PRESSED || 138 volume_down_pressed_ = event->type() == ui::ET_KEY_PRESSED ||
139 event->type() == ui::ET_TRANSLATED_KEY_PRESS; 139 event->type() == ui::ET_TRANSLATED_KEY_PRESS;
140 } 140 }
141 } 141 }
142 142
143 #if defined(OS_CHROMEOS) 143 #if defined(OS_CHROMEOS)
144 void PowerButtonController::OnDisplayModeChanged( 144 void PowerButtonController::OnDisplayModeChanged(
145 const ui::DisplayConfigurator::DisplayStateList& display_states) { 145 const ui::DisplayConfigurator::DisplayStateList& display_states) {
146 bool internal_display_off = false; 146 bool internal_display_off = false;
147 bool external_display_on = false; 147 bool external_display_on = false;
148 for (size_t i = 0; i < display_states.size(); ++i) { 148 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.
149 const ui::DisplayConfigurator::DisplayState& state = display_states[i]; 149 const ui::DisplaySnapshot& display = *display_states[i];
150 if (state.display->type() == ui::DISPLAY_CONNECTION_TYPE_INTERNAL) { 150 if (display.type() == ui::DISPLAY_CONNECTION_TYPE_INTERNAL) {
151 if (!state.display->current_mode()) 151 if (!display.current_mode())
152 internal_display_off = true; 152 internal_display_off = true;
153 } else if (state.display->current_mode()) { 153 } else if (display.current_mode()) {
154 external_display_on = true; 154 external_display_on = true;
155 } 155 }
156 } 156 }
157 internal_display_off_and_external_display_on_ = 157 internal_display_off_and_external_display_on_ =
158 internal_display_off && external_display_on; 158 internal_display_off && external_display_on;
159 } 159 }
160 #endif 160 #endif
161 161
162 } // namespace ash 162 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698