OLD | NEW |
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 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
11 | 11 |
12 #include "ash/display/display_layout_store.h" | 12 #include "ash/display/display_layout_store.h" |
13 #include "ash/display/display_manager.h" | 13 #include "ash/display/display_manager.h" |
14 #include "ash/display/display_util.h" | 14 #include "ash/display/display_util.h" |
15 #include "ash/display/resolution_notification_controller.h" | 15 #include "ash/display/resolution_notification_controller.h" |
16 #include "ash/display/screen_orientation_controller_chromeos.h" | 16 #include "ash/display/screen_orientation_controller_chromeos.h" |
17 #include "ash/display/window_tree_host_manager.h" | 17 #include "ash/display/window_tree_host_manager.h" |
18 #include "ash/screen_util.h" | 18 #include "ash/screen_util.h" |
19 #include "ash/shell.h" | 19 #include "ash/shell.h" |
20 #include "ash/test/ash_test_base.h" | 20 #include "ash/test/ash_test_base.h" |
21 #include "ash/test/display_manager_test_api.h" | 21 #include "ash/test/display_manager_test_api.h" |
22 #include "ash/wm/maximize_mode/maximize_mode_controller.h" | 22 #include "ash/wm/maximize_mode/maximize_mode_controller.h" |
23 #include "base/macros.h" | 23 #include "base/macros.h" |
24 #include "base/memory/ref_counted.h" | 24 #include "base/memory/ref_counted.h" |
25 #include "base/prefs/scoped_user_pref_update.h" | |
26 #include "base/prefs/testing_pref_service.h" | |
27 #include "base/strings/string_number_conversions.h" | 25 #include "base/strings/string_number_conversions.h" |
28 #include "base/values.h" | 26 #include "base/values.h" |
29 #include "chrome/browser/chromeos/display/display_configuration_observer.h" | 27 #include "chrome/browser/chromeos/display/display_configuration_observer.h" |
30 #include "chrome/browser/chromeos/login/users/mock_user_manager.h" | 28 #include "chrome/browser/chromeos/login/users/mock_user_manager.h" |
31 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" | 29 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" |
32 #include "chrome/common/pref_names.h" | 30 #include "chrome/common/pref_names.h" |
33 #include "chrome/test/base/testing_browser_process.h" | 31 #include "chrome/test/base/testing_browser_process.h" |
| 32 #include "components/prefs/scoped_user_pref_update.h" |
| 33 #include "components/prefs/testing_pref_service.h" |
34 #include "ui/display/chromeos/display_configurator.h" | 34 #include "ui/display/chromeos/display_configurator.h" |
35 #include "ui/gfx/geometry/vector3d_f.h" | 35 #include "ui/gfx/geometry/vector3d_f.h" |
36 #include "ui/gfx/screen.h" | 36 #include "ui/gfx/screen.h" |
37 #include "ui/message_center/message_center.h" | 37 #include "ui/message_center/message_center.h" |
38 | 38 |
39 using ash::ResolutionNotificationController; | 39 using ash::ResolutionNotificationController; |
40 | 40 |
41 namespace chromeos { | 41 namespace chromeos { |
42 namespace { | 42 namespace { |
43 const char kPrimaryIdKey[] = "primary-id"; | 43 const char kPrimaryIdKey[] = "primary-id"; |
(...skipping 929 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
973 // Sanity check. Restore to extended. | 973 // Sanity check. Restore to extended. |
974 StoreDisplayBoolPropertyForList(list, "default_unified", false); | 974 StoreDisplayBoolPropertyForList(list, "default_unified", false); |
975 StoreDisplayBoolPropertyForList(list, "mirrored", false); | 975 StoreDisplayBoolPropertyForList(list, "mirrored", false); |
976 LoadDisplayPreferences(false); | 976 LoadDisplayPreferences(false); |
977 UpdateDisplay("100x100,200x200"); | 977 UpdateDisplay("100x100,200x200"); |
978 EXPECT_FALSE(display_manager->IsInMirrorMode()); | 978 EXPECT_FALSE(display_manager->IsInMirrorMode()); |
979 EXPECT_FALSE(display_manager->IsInUnifiedMode()); | 979 EXPECT_FALSE(display_manager->IsInUnifiedMode()); |
980 } | 980 } |
981 | 981 |
982 } // namespace chromeos | 982 } // namespace chromeos |
OLD | NEW |