diff options
| author | tbarzic <tbarzic@chromium.org> | 2014-11-12 15:14:01 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-12 23:15:22 +0000 |
| commit | 61aaa96a45aaa556a96ee19b87f0e512129a27d7 (patch) | |
| tree | e92e00ffdb96f9044f49b42bd96e9afa27ddde8d /ash/wm | |
| parent | afd2466cf36ed0ed0bd4a186dfe5872d770470a1 (diff) | |
| download | chromium_src-61aaa96a45aaa556a96ee19b87f0e512129a27d7.zip chromium_src-61aaa96a45aaa556a96ee19b87f0e512129a27d7.tar.gz chromium_src-61aaa96a45aaa556a96ee19b87f0e512129a27d7.tar.bz2 | |
Revert "Implement ScreenOrientationDelegate on ChromeOS"
This reverts commit 4f3952e7d0172a50d26a6eb57660623db70000db.
It broke build packages on daisy:
http://build.chromium.org/p/chromiumos.chromium/builders/Daisy%20%28chromium%29/builds/2929
> Extend content::ScreenOrientationDelegate within ash to provide functionality on ChromeOS.
>
> Also provides a fix for a bug in ScreenOrientationProvider that was found during development.
>
> TEST=Manual testing on TouchView device with an HTML page that performs ScreenOrientation requests.
> BUG=396760
>
> Review URL: https://codereview.chromium.org/648733003
>
> Cr-Commit-Position: refs/heads/master@{#303898}
>
TBR=jonross@chromium.org
NOTRY=True
NOTREECHECKS=true
BUG=396760
Review URL: https://codereview.chromium.org/716193005
Cr-Commit-Position: refs/heads/master@{#303915}
Diffstat (limited to 'ash/wm')
| -rw-r--r-- | ash/wm/maximize_mode/maximize_mode_controller.cc | 5 | ||||
| -rw-r--r-- | ash/wm/maximize_mode/maximize_mode_controller.h | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/ash/wm/maximize_mode/maximize_mode_controller.cc b/ash/wm/maximize_mode/maximize_mode_controller.cc index 0e4acd7..1ca7e6a 100644 --- a/ash/wm/maximize_mode/maximize_mode_controller.cc +++ b/ash/wm/maximize_mode/maximize_mode_controller.cc @@ -153,11 +153,6 @@ void MaximizeModeController::SetRotationLocked(bool rotation_locked) { OnRotationLockChanged(rotation_locked_)); } -void MaximizeModeController::LockRotation(gfx::Display::Rotation rotation) { - SetRotationLocked(true); - SetDisplayRotation(Shell::GetInstance()->display_manager(), rotation); -} - void MaximizeModeController::AddObserver(Observer* observer) { observers_.AddObserver(observer); } diff --git a/ash/wm/maximize_mode/maximize_mode_controller.h b/ash/wm/maximize_mode/maximize_mode_controller.h index e103548..4210f27 100644 --- a/ash/wm/maximize_mode/maximize_mode_controller.h +++ b/ash/wm/maximize_mode/maximize_mode_controller.h @@ -76,11 +76,6 @@ class ASH_EXPORT MaximizeModeController // change the display rotation. void SetRotationLocked(bool rotation_locked); - // Sets the display rotation to |rotation| and prevents future calls to - // OnAccelerometerUpdated from changing the rotation. SetRotationLocked(false) - // removes the rotation lock. - void LockRotation(gfx::Display::Rotation rotation); - // Add/Remove observers. void AddObserver(Observer* observer); void RemoveObserver(Observer* observer); |