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_layout_store.h" | 7 #include "ash/display/display_layout_store.h" |
8 #include "ash/display/display_manager.h" | 8 #include "ash/display/display_manager.h" |
9 #include "ash/display/display_pref_util.h" | 9 #include "ash/display/display_pref_util.h" |
10 #include "ash/display/resolution_notification_controller.h" | 10 #include "ash/display/resolution_notification_controller.h" |
11 #include "ash/shell.h" | 11 #include "ash/shell.h" |
12 #include "base/prefs/pref_registry_simple.h" | 12 #include "base/prefs/pref_registry_simple.h" |
13 #include "base/prefs/pref_service.h" | 13 #include "base/prefs/pref_service.h" |
14 #include "base/prefs/scoped_user_pref_update.h" | 14 #include "base/prefs/scoped_user_pref_update.h" |
15 #include "base/strings/string16.h" | 15 #include "base/strings/string16.h" |
16 #include "base/strings/string_number_conversions.h" | 16 #include "base/strings/string_number_conversions.h" |
17 #include "base/strings/string_split.h" | 17 #include "base/strings/string_split.h" |
18 #include "base/strings/string_util.h" | 18 #include "base/strings/string_util.h" |
19 #include "base/values.h" | 19 #include "base/values.h" |
20 #include "chrome/browser/browser_process.h" | 20 #include "chrome/browser/browser_process.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 "third_party/cros_system_api/dbus/service_constants.h" | 23 #include "third_party/cros_system_api/dbus/service_constants.h" |
24 #include "ui/gfx/display.h" | 24 #include "ui/gfx/display.h" |
25 #include "ui/gfx/insets.h" | 25 #include "ui/gfx/insets.h" |
26 #include "ui/gfx/screen.h" | 26 #include "ui/gfx/screen.h" |
27 #include "url/url_canon.h" | 27 #include "url/url_canon.h" |
28 #include "url/url_util.h" | 28 #include "url/url_util.h" |
29 | 29 |
30 namespace chromeos { | 30 namespace chromeos { |
31 namespace { | 31 namespace { |
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
338 const ash::DisplayLayout& layout) { | 338 const ash::DisplayLayout& layout) { |
339 StoreDisplayLayoutPref(std::make_pair(id1, id2), layout); | 339 StoreDisplayLayoutPref(std::make_pair(id1, id2), layout); |
340 } | 340 } |
341 | 341 |
342 // Stores the given |power_state|. | 342 // Stores the given |power_state|. |
343 void StoreDisplayPowerStateForTest(DisplayPowerState power_state) { | 343 void StoreDisplayPowerStateForTest(DisplayPowerState power_state) { |
344 StoreDisplayPowerState(power_state); | 344 StoreDisplayPowerState(power_state); |
345 } | 345 } |
346 | 346 |
347 } // namespace chromeos | 347 } // namespace chromeos |
OLD | NEW |