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

Side by Side Diff: ash/display/screen_orientation_controller_chromeos.cc

Issue 2113053003: Moves Shell::maximize_mode_controller() to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: order Created 4 years, 5 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 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/display/screen_orientation_controller_chromeos.h" 5 #include "ash/display/screen_orientation_controller_chromeos.h"
6 6
7 #include "ash/common/ash_switches.h" 7 #include "ash/common/ash_switches.h"
8 #include "ash/common/display/display_info.h" 8 #include "ash/common/display/display_info.h"
9 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" 9 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
10 #include "ash/common/wm_shell.h" 10 #include "ash/common/wm_shell.h"
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 void ScreenOrientationController::UnlockOrientationForWindow( 106 void ScreenOrientationController::UnlockOrientationForWindow(
107 aura::Window* window) { 107 aura::Window* window) {
108 locking_windows_.erase(window); 108 locking_windows_.erase(window);
109 if (locking_windows_.empty()) 109 if (locking_windows_.empty())
110 Shell::GetInstance()->activation_client()->RemoveObserver(this); 110 Shell::GetInstance()->activation_client()->RemoveObserver(this);
111 window->RemoveObserver(this); 111 window->RemoveObserver(this);
112 ApplyLockForActiveWindow(); 112 ApplyLockForActiveWindow();
113 } 113 }
114 114
115 bool ScreenOrientationController::ScreenOrientationProviderSupported() const { 115 bool ScreenOrientationController::ScreenOrientationProviderSupported() const {
116 return Shell::GetInstance() 116 return WmShell::Get()
117 ->maximize_mode_controller() 117 ->maximize_mode_controller()
118 ->IsMaximizeModeWindowManagerEnabled() && 118 ->IsMaximizeModeWindowManagerEnabled() &&
119 !base::CommandLine::ForCurrentProcess()->HasSwitch( 119 !base::CommandLine::ForCurrentProcess()->HasSwitch(
120 switches::kAshDisableScreenOrientationLock); 120 switches::kAshDisableScreenOrientationLock);
121 } 121 }
122 122
123 void ScreenOrientationController::SetRotationLocked(bool rotation_locked) { 123 void ScreenOrientationController::SetRotationLocked(bool rotation_locked) {
124 if (rotation_locked_ == rotation_locked) 124 if (rotation_locked_ == rotation_locked)
125 return; 125 return;
126 rotation_locked_ = rotation_locked; 126 rotation_locked_ = rotation_locked;
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 } 415 }
416 416
417 bool ScreenOrientationController::CanRotateInLockedState() { 417 bool ScreenOrientationController::CanRotateInLockedState() {
418 return rotation_locked_orientation_ == 418 return rotation_locked_orientation_ ==
419 blink::WebScreenOrientationLockLandscape || 419 blink::WebScreenOrientationLockLandscape ||
420 rotation_locked_orientation_ == 420 rotation_locked_orientation_ ==
421 blink::WebScreenOrientationLockPortrait; 421 blink::WebScreenOrientationLockPortrait;
422 } 422 }
423 423
424 } // namespace ash 424 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698