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

Side by Side Diff: chrome/browser/profiles/profile.cc

Issue 1631923004: Sync 3rd party wallpaper app name (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address tbarzic@'s comments. 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/profiles/profile.h" 5 #include "chrome/browser/profiles/profile.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 // kApplicationLocale only in local state. 125 // kApplicationLocale only in local state.
126 // In the future we may want to maintain kApplicationLocale 126 // In the future we may want to maintain kApplicationLocale
127 // in user's profile for other platforms as well. 127 // in user's profile for other platforms as well.
128 registry->RegisterStringPref( 128 registry->RegisterStringPref(
129 prefs::kApplicationLocale, 129 prefs::kApplicationLocale,
130 std::string(), 130 std::string(),
131 user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF); 131 user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF);
132 registry->RegisterStringPref(prefs::kApplicationLocaleBackup, std::string()); 132 registry->RegisterStringPref(prefs::kApplicationLocaleBackup, std::string());
133 registry->RegisterStringPref(prefs::kApplicationLocaleAccepted, 133 registry->RegisterStringPref(prefs::kApplicationLocaleAccepted,
134 std::string()); 134 std::string());
135 registry->RegisterStringPref(prefs::kCurrentWallpaperAppName, std::string());
136 #endif 135 #endif
137 136
138 #if defined(OS_ANDROID) 137 #if defined(OS_ANDROID)
139 registry->RegisterBooleanPref(prefs::kDevToolsRemoteEnabled, false); 138 registry->RegisterBooleanPref(prefs::kDevToolsRemoteEnabled, false);
140 #endif 139 #endif
141 140
142 registry->RegisterBooleanPref(prefs::kDataSaverEnabled, false); 141 registry->RegisterBooleanPref(prefs::kDataSaverEnabled, false);
143 data_reduction_proxy::RegisterSyncableProfilePrefs(registry); 142 data_reduction_proxy::RegisterSyncableProfilePrefs(registry);
144 143
145 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) && !defined(OS_IOS) 144 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) && !defined(OS_IOS)
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 if (a->IsSameProfile(b)) 228 if (a->IsSameProfile(b))
230 return false; 229 return false;
231 return a->GetOriginalProfile() < b->GetOriginalProfile(); 230 return a->GetOriginalProfile() < b->GetOriginalProfile();
232 } 231 }
233 232
234 double Profile::GetDefaultZoomLevelForProfile() { 233 double Profile::GetDefaultZoomLevelForProfile() {
235 return GetDefaultStoragePartition(this) 234 return GetDefaultStoragePartition(this)
236 ->GetHostZoomMap() 235 ->GetHostZoomMap()
237 ->GetDefaultZoomLevel(); 236 ->GetDefaultZoomLevel();
238 } 237 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698