ash/system/overview/overview_button_tray_unittest.cc - Issue 1107383002: Merge Prevent DisplayPreferences from saving incorrect rotations.

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/system/overview/overview_button_tray_unittest.cc

Issue 1107383002: Merge Prevent DisplayPreferences from saving incorrect rotations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2357

Patch Set: Created 5 years, 7 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/system/chromeos/tray_display.cc ('k') | ash/test/ash_test_base.h » ('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/system/overview/overview_button_tray.h"	5 #include "ash/system/overview/overview_button_tray.h"

6	6

7 #include "ash/ash_switches.h"	7 #include "ash/ash_switches.h"

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

9 #include "ash/root_window_controller.h"	9 #include "ash/root_window_controller.h"

10 #include "ash/rotator/screen_rotation_animator.h"	10 #include "ash/rotator/screen_rotation_animator.h"

(...skipping 171 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
182 new ui::ScopedAnimationDurationScaleMode(	182 new ui::ScopedAnimationDurationScaleMode(

183 ui::ScopedAnimationDurationScaleMode::SLOW_DURATION));	183 ui::ScopedAnimationDurationScaleMode::SLOW_DURATION));

184 GetTray()->SetVisible(false);	184 GetTray()->SetVisible(false);

185	185

186 // ScreenRotationAnimator copies the current layers, and deletes them upon	186 // ScreenRotationAnimator copies the current layers, and deletes them upon

187 // completion. Allow its animation to complete first.	187 // completion. Allow its animation to complete first.

188 scoped_ptr<ui::ScopedAnimationDurationScaleMode> rotate_duration(	188 scoped_ptr<ui::ScopedAnimationDurationScaleMode> rotate_duration(

189 new ui::ScopedAnimationDurationScaleMode(	189 new ui::ScopedAnimationDurationScaleMode(

190 ui::ScopedAnimationDurationScaleMode::ZERO_DURATION));	190 ui::ScopedAnimationDurationScaleMode::ZERO_DURATION));

191 ash::ScreenRotationAnimator(gfx::Display::InternalDisplayId())	191 ash::ScreenRotationAnimator(gfx::Display::InternalDisplayId())

192 .Rotate(gfx::Display::ROTATE_270);	192 .Rotate(gfx::Display::ROTATE_270, gfx::Display::ROTATION_SOURCE_ACTIVE);

193	193

194 RunAllPendingInMessageLoop();	194 RunAllPendingInMessageLoop();

195 EXPECT_FALSE(GetTray()->visible());	195 EXPECT_FALSE(GetTray()->visible());

196 }	196 }

197	197

198 } // namespace ash	198 } // namespace ash

OLD	NEW