Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(114)

Side by Side Diff: ash/content/display/screen_orientation_controller_chromeos_unittest.cc

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)
Patch Set: Created 3 years, 9 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/common/wm_window_user_data_unittest.cc ('k') | ash/content/gpu_support_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <memory> 7 #include <memory>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/common/ash_switches.h" 10 #include "ash/ash_switches.h"
11 #include "ash/common/test/test_system_tray_delegate.h"
12 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
13 #include "ash/common/wm_shell.h"
14 #include "ash/content/shell_content_state.h" 11 #include "ash/content/shell_content_state.h"
15 #include "ash/shell.h" 12 #include "ash/shell.h"
16 #include "ash/system/screen_layout_observer.h" 13 #include "ash/system/screen_layout_observer.h"
17 #include "ash/test/ash_test_base.h" 14 #include "ash/test/ash_test_base.h"
18 #include "ash/test/ash_test_environment_content.h" 15 #include "ash/test/ash_test_environment_content.h"
19 #include "ash/test/ash_test_helper.h" 16 #include "ash/test/ash_test_helper.h"
20 #include "ash/test/content/test_shell_content_state.h" 17 #include "ash/test/content/test_shell_content_state.h"
21 #include "ash/test/test_shell_delegate.h" 18 #include "ash/test/test_shell_delegate.h"
19 #include "ash/test/test_system_tray_delegate.h"
20 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
21 #include "ash/wm_shell.h"
22 #include "base/command_line.h" 22 #include "base/command_line.h"
23 #include "chromeos/accelerometer/accelerometer_reader.h" 23 #include "chromeos/accelerometer/accelerometer_reader.h"
24 #include "chromeos/accelerometer/accelerometer_types.h" 24 #include "chromeos/accelerometer/accelerometer_types.h"
25 #include "content/public/browser/browser_context.h" 25 #include "content/public/browser/browser_context.h"
26 #include "content/public/browser/web_contents.h" 26 #include "content/public/browser/web_contents.h"
27 #include "content/public/test/test_browser_context.h" 27 #include "content/public/test/test_browser_context.h"
28 #include "third_party/WebKit/public/platform/modules/screen_orientation/WebScree nOrientationLockType.h" 28 #include "third_party/WebKit/public/platform/modules/screen_orientation/WebScree nOrientationLockType.h"
29 #include "ui/aura/window.h" 29 #include "ui/aura/window.h"
30 #include "ui/display/display.h" 30 #include "ui/display/display.h"
31 #include "ui/display/display_switches.h" 31 #include "ui/display/display_switches.h"
(...skipping 626 matching lines...) Expand 10 before | Expand all | Expand 10 after
658 658
659 Shell::GetInstance()->screen_orientation_controller()->SetDisplayRotation( 659 Shell::GetInstance()->screen_orientation_controller()->SetDisplayRotation(
660 kNewRotation, display::Display::ROTATION_SOURCE_ACTIVE); 660 kNewRotation, display::Display::ROTATION_SOURCE_ACTIVE);
661 661
662 EXPECT_EQ(kNewRotation, display_manager() 662 EXPECT_EQ(kNewRotation, display_manager()
663 ->GetDisplayInfo(kInternalDisplayId) 663 ->GetDisplayInfo(kInternalDisplayId)
664 .GetActiveRotation()); 664 .GetActiveRotation());
665 } 665 }
666 666
667 } // namespace ash 667 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/wm_window_user_data_unittest.cc ('k') | ash/content/gpu_support_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698