chrome/browser/chromeos/settings/device_settings_provider.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/settings/device_settings_provider.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/settings/cros_settings_provider.cc ('k') | chrome/browser/chromeos/settings/device_settings_test_helper.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/settings/device_settings_provider.h"	5 #include "chrome/browser/chromeos/settings/device_settings_provider.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/bind_helpers.h"	8 #include "base/bind_helpers.h"

9 #include "base/callback.h"	9 #include "base/callback.h"

10 #include "base/command_line.h"	10 #include "base/command_line.h"

11 #include "base/logging.h"	11 #include "base/logging.h"

12 #include "base/metrics/histogram.h"	12 #include "base/metrics/histogram.h"

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

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

15 #include "base/threading/thread_restrictions.h"	15 #include "base/threading/thread_restrictions.h"

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

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

18 #include "chrome/browser/chromeos/cros/cros_library.h"	18 #include "chrome/browser/chromeos/cros/cros_library.h"

19 #include "chrome/browser/chromeos/cros/network_library.h"	19 #include "chrome/browser/chromeos/cros/network_library.h"

20 #include "chrome/browser/chromeos/policy/device_local_account.h"	20 #include "chrome/browser/chromeos/policy/device_local_account.h"

21 #include "chrome/browser/chromeos/settings/cros_settings.h"	21 #include "chrome/browser/chromeos/settings/cros_settings.h"

22 #include "chrome/browser/chromeos/settings/cros_settings_names.h"	22 #include "chrome/browser/chromeos/settings/cros_settings_names.h"

23 #include "chrome/browser/chromeos/settings/device_settings_cache.h"	23 #include "chrome/browser/chromeos/settings/device_settings_cache.h"

24 #include "chrome/browser/policy/browser_policy_connector.h"	24 #include "chrome/browser/policy/browser_policy_connector.h"

(...skipping 920 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
945 void DeviceSettingsProvider::AttemptMigration() {	945 void DeviceSettingsProvider::AttemptMigration() {

946 if (device_settings_service_->HasPrivateOwnerKey()) {	946 if (device_settings_service_->HasPrivateOwnerKey()) {

947 PrefValueMap::const_iterator i;	947 PrefValueMap::const_iterator i;

948 for (i = migration_values_.begin(); i != migration_values_.end(); ++i)	948 for (i = migration_values_.begin(); i != migration_values_.end(); ++i)

949 DoSet(i->first, *i->second);	949 DoSet(i->first, *i->second);

950 migration_values_.Clear();	950 migration_values_.Clear();

951 }	951 }

952 }	952 }

953	953

954 } // namespace chromeos	954 } // namespace chromeos

OLD	NEW