ash/rotator/screen_rotation_animator.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/rotator/screen_rotation_animator.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/mus/bridge/wm_shell_mus.cc ('k') | ash/system/audio/audio_observer.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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/rotator/screen_rotation_animator.h"	5 #include "ash/rotator/screen_rotation_animator.h"

6	6

7 #include <string>	7 #include <string>

8 #include <utility>	8 #include <utility>

9 #include <vector>	9 #include <vector>

10	10

11 #include "ash/display/display_info.h"	11 #include "ash/common/display/display_info.h"

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

13 #include "ash/display/window_tree_host_manager.h"	13 #include "ash/display/window_tree_host_manager.h"

14 #include "ash/rotator/screen_rotation_animation.h"	14 #include "ash/rotator/screen_rotation_animation.h"

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

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

17 #include "base/time/time.h"	17 #include "base/time/time.h"

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

19 #include "ui/compositor/layer.h"	19 #include "ui/compositor/layer.h"

20 #include "ui/compositor/layer_animation_observer.h"	20 #include "ui/compositor/layer_animation_observer.h"

21 #include "ui/compositor/layer_animation_sequence.h"	21 #include "ui/compositor/layer_animation_sequence.h"

(...skipping 239 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
261 const display::Display::Rotation current_rotation =	261 const display::Display::Rotation current_rotation =

262 GetCurrentRotation(display_id_);	262 GetCurrentRotation(display_id_);

263	263

264 if (current_rotation == new_rotation)	264 if (current_rotation == new_rotation)

265 return;	265 return;

266	266

267 RotateScreen(display_id_, new_rotation, source);	267 RotateScreen(display_id_, new_rotation, source);

268 }	268 }

269	269

270 } // namespace ash	270 } // namespace ash

OLD	NEW