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 "ash/display/display_controller.h" | 7 #include "ash/display/display_controller.h" |
8 #include "ash/display/display_layout_store.h" | 8 #include "ash/display/display_layout_store.h" |
9 #include "ash/display/display_manager.h" | 9 #include "ash/display/display_manager.h" |
10 #include "ash/display/resolution_notification_controller.h" | 10 #include "ash/display/resolution_notification_controller.h" |
11 #include "ash/screen_util.h" | 11 #include "ash/screen_util.h" |
12 #include "ash/shell.h" | 12 #include "ash/shell.h" |
13 #include "ash/test/ash_test_base.h" | 13 #include "ash/test/ash_test_base.h" |
14 #include "ash/test/display_manager_test_api.h" | 14 #include "ash/test/display_manager_test_api.h" |
15 #include "base/prefs/scoped_user_pref_update.h" | 15 #include "base/prefs/scoped_user_pref_update.h" |
16 #include "base/prefs/testing_pref_service.h" | 16 #include "base/prefs/testing_pref_service.h" |
17 #include "base/strings/string_number_conversions.h" | 17 #include "base/strings/string_number_conversions.h" |
18 #include "base/values.h" | 18 #include "base/values.h" |
19 #include "chrome/browser/chromeos/display/display_configuration_observer.h" | 19 #include "chrome/browser/chromeos/display/display_configuration_observer.h" |
20 #include "chrome/browser/chromeos/login/mock_user_manager.h" | 20 #include "chrome/browser/chromeos/login/users/mock_user_manager.h" |
21 #include "chrome/browser/chromeos/login/user_manager.h" | 21 #include "chrome/browser/chromeos/login/users/user_manager.h" |
22 #include "chrome/common/pref_names.h" | 22 #include "chrome/common/pref_names.h" |
23 #include "chrome/test/base/testing_browser_process.h" | 23 #include "chrome/test/base/testing_browser_process.h" |
24 #include "ui/display/chromeos/display_configurator.h" | 24 #include "ui/display/chromeos/display_configurator.h" |
25 #include "ui/message_center/message_center.h" | 25 #include "ui/message_center/message_center.h" |
26 | 26 |
27 using ash::ResolutionNotificationController; | 27 using ash::ResolutionNotificationController; |
28 | 28 |
29 namespace chromeos { | 29 namespace chromeos { |
30 namespace { | 30 namespace { |
31 const char kPrimaryIdKey[] = "primary-id"; | 31 const char kPrimaryIdKey[] = "primary-id"; |
(...skipping 582 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
614 local_state()->GetString(prefs::kDisplayPowerState)); | 614 local_state()->GetString(prefs::kDisplayPowerState)); |
615 | 615 |
616 // Don't try to load | 616 // Don't try to load |
617 local_state()->SetString(prefs::kDisplayPowerState, "all_off"); | 617 local_state()->SetString(prefs::kDisplayPowerState, "all_off"); |
618 LoadDisplayPreferences(false); | 618 LoadDisplayPreferences(false); |
619 EXPECT_EQ(chromeos::DISPLAY_POWER_INTERNAL_OFF_EXTERNAL_ON, | 619 EXPECT_EQ(chromeos::DISPLAY_POWER_INTERNAL_OFF_EXTERNAL_ON, |
620 shell->display_configurator()->power_state()); | 620 shell->display_configurator()->power_state()); |
621 } | 621 } |
622 | 622 |
623 } // namespace chromeos | 623 } // namespace chromeos |
OLD | NEW |