Skip to content

Commit

Permalink
Revert of Enable ScreenOrientation on ChromeOS
Browse files Browse the repository at this point in the history
Revert of Enable ScreenOrientation on ChromeOS (patchset chromium#1 id:1 of https://codereview.chromium.org/797093005/)

Reason for revert:
This feature was not approved for release in M-41. Re-disabling it by default.

Original issue's description:
> Enable ScreenOrientation on ChromeOS
>
> Remove the flag blocking ScreenOrientation to enable it by default.
>
> TBR=oshima@chromium.org
> BUG=396760
>
> Committed: https://crrev.com/90cab9cb698467c3a8f0e4bc1020003f7e98d74f
> Cr-Commit-Position: refs/heads/master@{#309086}

TBR=oshima@chromium.org
BUG=396760

Review URL: https://codereview.chromium.org/831153003

Cr-Commit-Position: refs/heads/master@{#310206}
  • Loading branch information
jonross authored and Commit bot committed Jan 7, 2015
1 parent 699c53e commit cd2efb7
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion ash/content/display/screen_orientation_delegate_chromeos.cc
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,9 @@ void ScreenOrientationDelegate::Lock(
bool ScreenOrientationDelegate::ScreenOrientationProviderSupported() {
return Shell::GetInstance()
->maximize_mode_controller()
->IsMaximizeModeWindowManagerEnabled();
->IsMaximizeModeWindowManagerEnabled() &&
base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kAshEnableTouchViewTesting);
}

void ScreenOrientationDelegate::Unlock(content::WebContents* web_contents) {
Expand Down

0 comments on commit cd2efb7

Please sign in to comment.