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

Side by Side Diff: components/user_prefs/pref_registry_syncable.cc

Issue 13973004: Convert string16 -> base::string16 in components/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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
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 "components/user_prefs/pref_registry_syncable.h" 5 #include "components/user_prefs/pref_registry_syncable.h"
6 6
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/prefs/default_pref_store.h" 8 #include "base/prefs/default_pref_store.h"
9 #include "base/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "ui/base/l10n/l10n_util.h" 11 #include "ui/base/l10n/l10n_util.h"
12 12
13 namespace { 13 namespace {
14 14
15 // A helper function for RegisterLocalized*Pref that creates a Value* 15 // A helper function for RegisterLocalized*Pref that creates a Value*
16 // based on a localized resource. Because we control the values in a 16 // based on a localized resource. Because we control the values in a
17 // locale dll, this should always return a Value of the appropriate 17 // locale dll, this should always return a Value of the appropriate
18 // type. 18 // type.
19 base::Value* CreateLocaleDefaultValue(base::Value::Type type, 19 base::Value* CreateLocaleDefaultValue(base::Value::Type type,
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 } 212 }
213 213
214 scoped_refptr<PrefRegistrySyncable> PrefRegistrySyncable::ForkForIncognito() { 214 scoped_refptr<PrefRegistrySyncable> PrefRegistrySyncable::ForkForIncognito() {
215 // TODO(joi): We can directly reuse the same PrefRegistry once 215 // TODO(joi): We can directly reuse the same PrefRegistry once
216 // PrefService no longer registers for callbacks on registration and 216 // PrefService no longer registers for callbacks on registration and
217 // unregistration. 217 // unregistration.
218 scoped_refptr<PrefRegistrySyncable> registry(new PrefRegistrySyncable()); 218 scoped_refptr<PrefRegistrySyncable> registry(new PrefRegistrySyncable());
219 registry->defaults_ = defaults_; 219 registry->defaults_ = defaults_;
220 return registry; 220 return registry;
221 } 221 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698