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

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

Issue 2118643002: Move MaximizeModeController into ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: doh Created 4 years, 5 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_shell.cc ('k') | ash/display/screen_orientation_controller_chromeos.cc » ('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/common/ash_switches.h"
11 #include "ash/common/display/display_info.h" 11 #include "ash/common/display/display_info.h"
12 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
12 #include "ash/content/shell_content_state.h" 13 #include "ash/content/shell_content_state.h"
13 #include "ash/display/display_manager.h" 14 #include "ash/display/display_manager.h"
14 #include "ash/shell.h" 15 #include "ash/shell.h"
15 #include "ash/test/ash_test_base.h" 16 #include "ash/test/ash_test_base.h"
16 #include "ash/test/ash_test_helper.h" 17 #include "ash/test/ash_test_helper.h"
17 #include "ash/test/content/test_shell_content_state.h" 18 #include "ash/test/content/test_shell_content_state.h"
18 #include "ash/test/display_manager_test_api.h" 19 #include "ash/test/display_manager_test_api.h"
19 #include "ash/test/test_shell_delegate.h" 20 #include "ash/test/test_shell_delegate.h"
20 #include "ash/test/test_system_tray_delegate.h" 21 #include "ash/test/test_system_tray_delegate.h"
21 #include "ash/wm/maximize_mode/maximize_mode_controller.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/message_center/message_center.h" 31 #include "ui/message_center/message_center.h"
(...skipping 618 matching lines...) Expand 10 before | Expand all | Expand 10 after
650 650
651 Shell::GetInstance()->screen_orientation_controller()->SetDisplayRotation( 651 Shell::GetInstance()->screen_orientation_controller()->SetDisplayRotation(
652 kNewRotation, display::Display::ROTATION_SOURCE_ACTIVE); 652 kNewRotation, display::Display::ROTATION_SOURCE_ACTIVE);
653 653
654 EXPECT_EQ( 654 EXPECT_EQ(
655 kNewRotation, 655 kNewRotation,
656 display_manager->GetDisplayInfo(kInternalDisplayId).GetActiveRotation()); 656 display_manager->GetDisplayInfo(kInternalDisplayId).GetActiveRotation());
657 } 657 }
658 658
659 } // namespace ash 659 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/wm_shell.cc ('k') | ash/display/screen_orientation_controller_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698