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

Side by Side Diff: ash/wm/power_button_controller.cc

Issue 1155013005: Refactoring the ownership of ui::InputMethod. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed bot failure: cast_shell_linux Created 5 years, 6 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 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 if (power_button_down_) 127 if (power_button_down_)
128 return; 128 return;
129 129
130 if (down) 130 if (down)
131 controller_->StartLockAnimation(false); 131 controller_->StartLockAnimation(false);
132 else 132 else
133 controller_->CancelLockAnimation(); 133 controller_->CancelLockAnimation();
134 } 134 }
135 135
136 void PowerButtonController::OnKeyEvent(ui::KeyEvent* event) { 136 void PowerButtonController::OnKeyEvent(ui::KeyEvent* event) {
137 if (event->key_code() == ui::VKEY_VOLUME_DOWN) { 137 if (event->key_code() == ui::VKEY_VOLUME_DOWN)
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;
140 }
141 } 139 }
142 140
143 #if defined(OS_CHROMEOS) 141 #if defined(OS_CHROMEOS)
144 void PowerButtonController::OnDisplayModeChanged( 142 void PowerButtonController::OnDisplayModeChanged(
145 const ui::DisplayConfigurator::DisplayStateList& display_states) { 143 const ui::DisplayConfigurator::DisplayStateList& display_states) {
146 bool internal_display_off = false; 144 bool internal_display_off = false;
147 bool external_display_on = false; 145 bool external_display_on = false;
148 for (const ui::DisplaySnapshot* display : display_states) { 146 for (const ui::DisplaySnapshot* display : display_states) {
149 if (display->type() == ui::DISPLAY_CONNECTION_TYPE_INTERNAL) { 147 if (display->type() == ui::DISPLAY_CONNECTION_TYPE_INTERNAL) {
150 if (!display->current_mode()) 148 if (!display->current_mode())
151 internal_display_off = true; 149 internal_display_off = true;
152 } else if (display->current_mode()) { 150 } else if (display->current_mode()) {
153 external_display_on = true; 151 external_display_on = true;
154 } 152 }
155 } 153 }
156 internal_display_off_and_external_display_on_ = 154 internal_display_off_and_external_display_on_ =
157 internal_display_off && external_display_on; 155 internal_display_off && external_display_on;
158 } 156 }
159 #endif 157 #endif
160 158
161 } // namespace ash 159 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698