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

Side by Side Diff: chrome/browser/chromeos/display/display_preferences_unittest.cc

Issue 2223063003: Move DisplayLayoutStore from ash to ui. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase/add TODO. Created 4 years, 4 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 | « chrome/browser/chromeos/display/display_preferences.cc ('k') | ui/display/BUILD.gn » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/chromeos/display/display_preferences.h" 5 #include "chrome/browser/chromeos/display/display_preferences.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
11 #include <vector> 11 #include <vector>
12 12
13 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" 13 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
14 #include "ash/common/wm_shell.h" 14 #include "ash/common/wm_shell.h"
15 #include "ash/display/display_layout_store.h"
16 #include "ash/display/display_manager.h" 15 #include "ash/display/display_manager.h"
17 #include "ash/display/display_util.h" 16 #include "ash/display/display_util.h"
18 #include "ash/display/json_converter.h" 17 #include "ash/display/json_converter.h"
19 #include "ash/display/resolution_notification_controller.h" 18 #include "ash/display/resolution_notification_controller.h"
20 #include "ash/display/screen_orientation_controller_chromeos.h" 19 #include "ash/display/screen_orientation_controller_chromeos.h"
21 #include "ash/display/window_tree_host_manager.h" 20 #include "ash/display/window_tree_host_manager.h"
22 #include "ash/screen_util.h" 21 #include "ash/screen_util.h"
23 #include "ash/shell.h" 22 #include "ash/shell.h"
24 #include "ash/test/ash_test_base.h" 23 #include "ash/test/ash_test_base.h"
25 #include "ash/test/display_manager_test_api.h" 24 #include "ash/test/display_manager_test_api.h"
26 #include "base/macros.h" 25 #include "base/macros.h"
27 #include "base/memory/ptr_util.h" 26 #include "base/memory/ptr_util.h"
28 #include "base/memory/ref_counted.h" 27 #include "base/memory/ref_counted.h"
29 #include "base/strings/string_number_conversions.h" 28 #include "base/strings/string_number_conversions.h"
30 #include "base/values.h" 29 #include "base/values.h"
31 #include "chrome/browser/chromeos/display/display_configuration_observer.h" 30 #include "chrome/browser/chromeos/display/display_configuration_observer.h"
32 #include "chrome/browser/chromeos/login/users/mock_user_manager.h" 31 #include "chrome/browser/chromeos/login/users/mock_user_manager.h"
33 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" 32 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
34 #include "chrome/common/pref_names.h" 33 #include "chrome/common/pref_names.h"
35 #include "chrome/test/base/testing_browser_process.h" 34 #include "chrome/test/base/testing_browser_process.h"
36 #include "components/prefs/scoped_user_pref_update.h" 35 #include "components/prefs/scoped_user_pref_update.h"
37 #include "components/prefs/testing_pref_service.h" 36 #include "components/prefs/testing_pref_service.h"
38 #include "ui/display/chromeos/display_configurator.h" 37 #include "ui/display/chromeos/display_configurator.h"
39 #include "ui/display/manager/display_layout_builder.h" 38 #include "ui/display/manager/display_layout_builder.h"
39 #include "ui/display/manager/display_layout_store.h"
40 #include "ui/display/screen.h" 40 #include "ui/display/screen.h"
41 #include "ui/gfx/geometry/vector3d_f.h" 41 #include "ui/gfx/geometry/vector3d_f.h"
42 #include "ui/message_center/message_center.h" 42 #include "ui/message_center/message_center.h"
43 43
44 using ash::ResolutionNotificationController; 44 using ash::ResolutionNotificationController;
45 45
46 namespace chromeos { 46 namespace chromeos {
47 namespace { 47 namespace {
48 const char kPrimaryIdKey[] = "primary-id"; 48 const char kPrimaryIdKey[] = "primary-id";
49 const char kMirroredKey[] = "mirrored"; 49 const char kMirroredKey[] = "mirrored";
(...skipping 1069 matching lines...) Expand 10 before | Expand all | Expand 10 after
1119 1119
1120 EXPECT_EQ(gfx::Rect(0, 0, 200, 200), 1120 EXPECT_EQ(gfx::Rect(0, 0, 200, 200),
1121 display_manager->GetDisplayForId(list[0]).bounds()); 1121 display_manager->GetDisplayForId(list[0]).bounds());
1122 EXPECT_EQ(gfx::Rect(-200, 0, 200, 200), 1122 EXPECT_EQ(gfx::Rect(-200, 0, 200, 200),
1123 display_manager->GetDisplayForId(list[1]).bounds()); 1123 display_manager->GetDisplayForId(list[1]).bounds());
1124 EXPECT_EQ(gfx::Rect(-100, 200, 300, 300), 1124 EXPECT_EQ(gfx::Rect(-100, 200, 300, 300),
1125 display_manager->GetDisplayForId(list[2]).bounds()); 1125 display_manager->GetDisplayForId(list[2]).bounds());
1126 } 1126 }
1127 1127
1128 } // namespace chromeos 1128 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/display/display_preferences.cc ('k') | ui/display/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698