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

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

Issue 1151373005: Update Blink's screen orientation path in Chromium. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix one include Created 5 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
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 <vector> 5 #include <vector>
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/content/display/screen_orientation_controller_chromeos.h" 8 #include "ash/content/display/screen_orientation_controller_chromeos.h"
9 #include "ash/display/display_info.h" 9 #include "ash/display/display_info.h"
10 #include "ash/display/display_manager.h" 10 #include "ash/display/display_manager.h"
11 #include "ash/shell.h" 11 #include "ash/shell.h"
12 #include "ash/test/ash_test_base.h" 12 #include "ash/test/ash_test_base.h"
13 #include "ash/test/ash_test_helper.h" 13 #include "ash/test/ash_test_helper.h"
14 #include "ash/test/display_manager_test_api.h" 14 #include "ash/test/display_manager_test_api.h"
15 #include "ash/test/test_shell_delegate.h" 15 #include "ash/test/test_shell_delegate.h"
16 #include "ash/test/test_system_tray_delegate.h" 16 #include "ash/test/test_system_tray_delegate.h"
17 #include "ash/wm/maximize_mode/maximize_mode_controller.h" 17 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
18 #include "base/command_line.h" 18 #include "base/command_line.h"
19 #include "base/memory/scoped_ptr.h" 19 #include "base/memory/scoped_ptr.h"
20 #include "chromeos/accelerometer/accelerometer_reader.h" 20 #include "chromeos/accelerometer/accelerometer_reader.h"
21 #include "chromeos/accelerometer/accelerometer_types.h" 21 #include "chromeos/accelerometer/accelerometer_types.h"
22 #include "content/public/browser/browser_context.h" 22 #include "content/public/browser/browser_context.h"
23 #include "content/public/browser/web_contents.h" 23 #include "content/public/browser/web_contents.h"
24 #include "content/public/test/test_browser_context.h" 24 #include "content/public/test/test_browser_context.h"
25 #include "third_party/WebKit/public/platform/WebScreenOrientationLockType.h" 25 #include "third_party/WebKit/public/platform/modules/screen_orientation/WebScree nOrientationLockType.h"
26 #include "ui/aura/window.h" 26 #include "ui/aura/window.h"
27 #include "ui/gfx/display.h" 27 #include "ui/gfx/display.h"
28 #include "ui/message_center/message_center.h" 28 #include "ui/message_center/message_center.h"
29 #include "ui/views/test/webview_test_helper.h" 29 #include "ui/views/test/webview_test_helper.h"
30 #include "ui/views/view.h" 30 #include "ui/views/view.h"
31 #include "ui/views/views_delegate.h" 31 #include "ui/views/views_delegate.h"
32 #include "ui/wm/public/activation_client.h" 32 #include "ui/wm/public/activation_client.h"
33 33
34 namespace ash { 34 namespace ash {
35 35
(...skipping 606 matching lines...) Expand 10 before | Expand all | Expand 10 after
642 gfx::Display::ROTATION_SOURCE_ACTIVE); 642 gfx::Display::ROTATION_SOURCE_ACTIVE);
643 643
644 // TODO(bruthig): Uncomment when www.crbug.com/480703 is fixed. This test 644 // TODO(bruthig): Uncomment when www.crbug.com/480703 is fixed. This test
645 // still adds value by ensuring a crash does not occur. See 645 // still adds value by ensuring a crash does not occur. See
646 // www.crbug.com/479503. 646 // www.crbug.com/479503.
647 // ASSERT_EQ(kNewRotation, display_manager->GetDisplayInfo(kInternalDisplayId) 647 // ASSERT_EQ(kNewRotation, display_manager->GetDisplayInfo(kInternalDisplayId)
648 // .GetActiveRotation()); 648 // .GetActiveRotation());
649 } 649 }
650 650
651 } // namespace ash 651 } // namespace ash
OLDNEW
« no previous file with comments | « ash/content/display/screen_orientation_controller_chromeos.h ('k') | components/test_runner/mock_screen_orientation_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698