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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include "ash/display/display_layout_store.h" 9 #include "ash/display/display_layout_store.h"
10 #include "ash/display/display_manager.h" 10 #include "ash/display/display_manager.h"
11 #include "ash/display/display_pref_util.h" 11 #include "ash/display/display_pref_util.h"
12 #include "ash/display/display_util.h" 12 #include "ash/display/display_util.h"
13 #include "ash/shell.h" 13 #include "ash/shell.h"
14 #include "base/prefs/pref_registry_simple.h"
15 #include "base/prefs/pref_service.h"
16 #include "base/prefs/scoped_user_pref_update.h"
17 #include "base/strings/string16.h" 14 #include "base/strings/string16.h"
18 #include "base/strings/string_number_conversions.h" 15 #include "base/strings/string_number_conversions.h"
19 #include "base/strings/string_split.h" 16 #include "base/strings/string_split.h"
20 #include "base/strings/string_util.h" 17 #include "base/strings/string_util.h"
21 #include "base/sys_info.h" 18 #include "base/sys_info.h"
22 #include "base/values.h" 19 #include "base/values.h"
23 #include "chrome/browser/browser_process.h" 20 #include "chrome/browser/browser_process.h"
24 #include "chrome/common/pref_names.h" 21 #include "chrome/common/pref_names.h"
22 #include "components/prefs/pref_registry_simple.h"
23 #include "components/prefs/pref_service.h"
24 #include "components/prefs/scoped_user_pref_update.h"
25 #include "components/user_manager/user_manager.h" 25 #include "components/user_manager/user_manager.h"
26 #include "third_party/cros_system_api/dbus/service_constants.h" 26 #include "third_party/cros_system_api/dbus/service_constants.h"
27 #include "ui/gfx/display.h" 27 #include "ui/gfx/display.h"
28 #include "ui/gfx/geometry/insets.h" 28 #include "ui/gfx/geometry/insets.h"
29 #include "ui/gfx/screen.h" 29 #include "ui/gfx/screen.h"
30 #include "url/url_canon.h" 30 #include "url/url_canon.h"
31 #include "url/url_util.h" 31 #include "url/url_util.h"
32 32
33 namespace chromeos { 33 namespace chromeos {
34 namespace { 34 namespace {
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 const ash::DisplayLayout& layout) { 394 const ash::DisplayLayout& layout) {
395 StoreDisplayLayoutPref(ash::CreateDisplayIdList(id1, id2), layout); 395 StoreDisplayLayoutPref(ash::CreateDisplayIdList(id1, id2), layout);
396 } 396 }
397 397
398 // Stores the given |power_state|. 398 // Stores the given |power_state|.
399 void StoreDisplayPowerStateForTest(DisplayPowerState power_state) { 399 void StoreDisplayPowerStateForTest(DisplayPowerState power_state) {
400 StoreDisplayPowerState(power_state); 400 StoreDisplayPowerState(power_state);
401 } 401 }
402 402
403 } // namespace chromeos 403 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698