chrome/browser/chromeos/display/display_preferences.cc - Issue 15798019: Use a direct include of strings headers in chrome/browser/chromeos/.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 15798019: Use a direct include of strings headers in chrome/browser/chromeos/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/chromeos/dbus/printer_service_provider.cc ('k') | chrome/browser/chromeos/drive/drive_app_registry.cc » ('j') | no next file with comments »

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_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/shell.h"	10 #include "ash/shell.h"

11 #include "base/prefs/pref_registry_simple.h"	11 #include "base/prefs/pref_registry_simple.h"

12 #include "base/prefs/pref_service.h"	12 #include "base/prefs/pref_service.h"

13 #include "base/string16.h"	13 #include "base/strings/string16.h"

14 #include "base/string_util.h"

15 #include "base/strings/string_number_conversions.h"	14 #include "base/strings/string_number_conversions.h"

16 #include "base/strings/string_split.h"	15 #include "base/strings/string_split.h"

	16 #include "base/strings/string_util.h"

17 #include "base/values.h"	17 #include "base/values.h"

18 #include "chrome/browser/browser_process.h"	18 #include "chrome/browser/browser_process.h"

19 #include "chrome/browser/chromeos/login/user_manager.h"	19 #include "chrome/browser/chromeos/login/user_manager.h"

20 #include "chrome/browser/prefs/scoped_user_pref_update.h"	20 #include "chrome/browser/prefs/scoped_user_pref_update.h"

21 #include "chrome/common/pref_names.h"	21 #include "chrome/common/pref_names.h"

22 #include "chromeos/display/output_configurator.h"	22 #include "chromeos/display/output_configurator.h"

23 #include "googleurl/src/url_canon.h"	23 #include "googleurl/src/url_canon.h"

24 #include "googleurl/src/url_util.h"	24 #include "googleurl/src/url_util.h"

25 #include "third_party/cros_system_api/dbus/service_constants.h"	25 #include "third_party/cros_system_api/dbus/service_constants.h"

26 #include "ui/gfx/display.h"	26 #include "ui/gfx/display.h"

(...skipping 282 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
309 const ash::DisplayLayout& layout) {	309 const ash::DisplayLayout& layout) {

310 StoreDisplayLayoutPref(std::make_pair(id1, id2), layout);	310 StoreDisplayLayoutPref(std::make_pair(id1, id2), layout);

311 }	311 }

312	312

313 // Stores the given \|power_state\|.	313 // Stores the given \|power_state\|.

314 void StoreDisplayPowerStateForTest(DisplayPowerState power_state) {	314 void StoreDisplayPowerStateForTest(DisplayPowerState power_state) {

315 StoreDisplayPowerState(power_state);	315 StoreDisplayPowerState(power_state);

316 }	316 }

317	317

318 } // namespace chromeos	318 } // namespace chromeos

OLD	NEW