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 <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "ash/display/display_controller.h" | 10 #include "ash/display/display_controller.h" |
11 #include "ash/display/display_layout_store.h" | 11 #include "ash/display/display_layout_store.h" |
12 #include "ash/display/display_manager.h" | 12 #include "ash/display/display_manager.h" |
13 #include "ash/display/resolution_notification_controller.h" | 13 #include "ash/display/resolution_notification_controller.h" |
14 #include "ash/screen_util.h" | 14 #include "ash/screen_util.h" |
15 #include "ash/shell.h" | 15 #include "ash/shell.h" |
16 #include "ash/test/ash_test_base.h" | 16 #include "ash/test/ash_test_base.h" |
17 #include "ash/test/display_manager_test_api.h" | 17 #include "ash/test/display_manager_test_api.h" |
18 #include "ash/wm/maximize_mode/maximize_mode_controller.h" | 18 #include "ash/wm/maximize_mode/maximize_mode_controller.h" |
19 #include "base/prefs/scoped_user_pref_update.h" | 19 #include "base/prefs/scoped_user_pref_update.h" |
20 #include "base/prefs/testing_pref_service.h" | 20 #include "base/prefs/testing_pref_service.h" |
21 #include "base/strings/string_number_conversions.h" | 21 #include "base/strings/string_number_conversions.h" |
22 #include "base/values.h" | 22 #include "base/values.h" |
23 #include "chrome/browser/chromeos/display/display_configuration_observer.h" | 23 #include "chrome/browser/chromeos/display/display_configuration_observer.h" |
24 #include "chrome/browser/chromeos/login/users/mock_user_manager.h" | 24 #include "chrome/browser/chromeos/login/users/mock_user_manager.h" |
25 #include "chrome/browser/chromeos/login/users/user_manager.h" | 25 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" |
26 #include "chrome/common/pref_names.h" | 26 #include "chrome/common/pref_names.h" |
27 #include "chrome/test/base/testing_browser_process.h" | 27 #include "chrome/test/base/testing_browser_process.h" |
28 #include "ui/display/chromeos/display_configurator.h" | 28 #include "ui/display/chromeos/display_configurator.h" |
29 #include "ui/gfx/vector3d_f.h" | 29 #include "ui/gfx/vector3d_f.h" |
30 #include "ui/message_center/message_center.h" | 30 #include "ui/message_center/message_center.h" |
31 | 31 |
32 using ash::ResolutionNotificationController; | 32 using ash::ResolutionNotificationController; |
33 | 33 |
34 namespace chromeos { | 34 namespace chromeos { |
35 namespace { | 35 namespace { |
(...skipping 633 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
669 local_state()->GetDictionary(prefs::kDisplayProperties); | 669 local_state()->GetDictionary(prefs::kDisplayProperties); |
670 const base::DictionaryValue* property = NULL; | 670 const base::DictionaryValue* property = NULL; |
671 EXPECT_TRUE(properties->GetDictionary( | 671 EXPECT_TRUE(properties->GetDictionary( |
672 base::Int64ToString(gfx::Display::InternalDisplayId()), &property)); | 672 base::Int64ToString(gfx::Display::InternalDisplayId()), &property)); |
673 int rotation = -1; | 673 int rotation = -1; |
674 EXPECT_TRUE(property->GetInteger("rotation", &rotation)); | 674 EXPECT_TRUE(property->GetInteger("rotation", &rotation)); |
675 EXPECT_EQ(gfx::Display::ROTATE_0, rotation); | 675 EXPECT_EQ(gfx::Display::ROTATE_0, rotation); |
676 } | 676 } |
677 | 677 |
678 } // namespace chromeos | 678 } // namespace chromeos |
OLD | NEW |