ash/display/screen_orientation_controller_chromeos.cc - Issue 2084533008: mash: Migrate tray audio and deps to common.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2084533008: mash: Migrate tray audio and deps to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Sync and rebase. Created 4 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

« no previous file with comments | « ash/display/root_window_transformers_unittest.cc ('k') | ash/display/window_tree_host_manager_unittest.cc » ('j') | no next file with comments »

OLD	NEW
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/wm_shell.h"	9 #include "ash/common/wm_shell.h"

9 #include "ash/display/display_configuration_controller.h"	10 #include "ash/display/display_configuration_controller.h"

10 #include "ash/display/display_info.h"

11 #include "ash/display/display_manager.h"	11 #include "ash/display/display_manager.h"

12 #include "ash/shell.h"	12 #include "ash/shell.h"

13 #include "ash/wm/maximize_mode/maximize_mode_controller.h"	13 #include "ash/wm/maximize_mode/maximize_mode_controller.h"

14 #include "base/auto_reset.h"	14 #include "base/auto_reset.h"

15 #include "base/command_line.h"	15 #include "base/command_line.h"

16 #include "chromeos/accelerometer/accelerometer_reader.h"	16 #include "chromeos/accelerometer/accelerometer_reader.h"

17 #include "chromeos/accelerometer/accelerometer_types.h"	17 #include "chromeos/accelerometer/accelerometer_types.h"

18 #include "ui/aura/window.h"	18 #include "ui/aura/window.h"

19 #include "ui/aura/window_observer.h"	19 #include "ui/aura/window_observer.h"

20 #include "ui/chromeos/accelerometer/accelerometer_util.h"	20 #include "ui/chromeos/accelerometer/accelerometer_util.h"

(...skipping 394 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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

OLD	NEW