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

Side by Side Diff: ash/wm/maximize_mode/maximize_mode_controller.cc

Issue 723633003: Reland ScreenOrientationDelegate on ChromeOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix ChromeOS build error Created 6 years, 1 month 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/maximize_mode/maximize_mode_controller.h" 5 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
6 6
7 #include "ash/accelerators/accelerator_controller.h" 7 #include "ash/accelerators/accelerator_controller.h"
8 #include "ash/accelerators/accelerator_table.h" 8 #include "ash/accelerators/accelerator_table.h"
9 #include "ash/accelerometer/accelerometer_controller.h" 9 #include "ash/accelerometer/accelerometer_controller.h"
10 #include "ash/ash_switches.h" 10 #include "ash/ash_switches.h"
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 return; 146 return;
147 base::AutoReset<bool> auto_ignore_display_configuration_updates( 147 base::AutoReset<bool> auto_ignore_display_configuration_updates(
148 &ignore_display_configuration_updates_, true); 148 &ignore_display_configuration_updates_, true);
149 rotation_locked_ = rotation_locked; 149 rotation_locked_ = rotation_locked;
150 Shell::GetInstance()->display_manager()-> 150 Shell::GetInstance()->display_manager()->
151 RegisterDisplayRotationProperties(rotation_locked_, current_rotation_); 151 RegisterDisplayRotationProperties(rotation_locked_, current_rotation_);
152 FOR_EACH_OBSERVER(Observer, observers_, 152 FOR_EACH_OBSERVER(Observer, observers_,
153 OnRotationLockChanged(rotation_locked_)); 153 OnRotationLockChanged(rotation_locked_));
154 } 154 }
155 155
156 void MaximizeModeController::LockRotation(gfx::Display::Rotation rotation) {
157 SetRotationLocked(true);
158 SetDisplayRotation(Shell::GetInstance()->display_manager(), rotation);
159 }
160
156 void MaximizeModeController::AddObserver(Observer* observer) { 161 void MaximizeModeController::AddObserver(Observer* observer) {
157 observers_.AddObserver(observer); 162 observers_.AddObserver(observer);
158 } 163 }
159 164
160 void MaximizeModeController::RemoveObserver(Observer* observer) { 165 void MaximizeModeController::RemoveObserver(Observer* observer) {
161 observers_.RemoveObserver(observer); 166 observers_.RemoveObserver(observer);
162 } 167 }
163 168
164 bool MaximizeModeController::CanEnterMaximizeMode() { 169 bool MaximizeModeController::CanEnterMaximizeMode() {
165 // If we have ever seen accelerometer data, then HandleHingeRotation may 170 // If we have ever seen accelerometer data, then HandleHingeRotation may
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
495 return elapsed_time <= kLidRecentlyOpenedDuration; 500 return elapsed_time <= kLidRecentlyOpenedDuration;
496 } 501 }
497 502
498 void MaximizeModeController::SetTickClockForTest( 503 void MaximizeModeController::SetTickClockForTest(
499 scoped_ptr<base::TickClock> tick_clock) { 504 scoped_ptr<base::TickClock> tick_clock) {
500 DCHECK(tick_clock_); 505 DCHECK(tick_clock_);
501 tick_clock_ = tick_clock.Pass(); 506 tick_clock_ = tick_clock.Pass();
502 } 507 }
503 508
504 } // namespace ash 509 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698