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

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

Issue 412143009: Moved data reduction proxy initialization logic to ProfileImplIOData (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit Created 6 years, 4 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 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 std::string(), 181 std::string(),
182 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 182 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
183 #endif 183 #endif
184 184
185 #if defined(OS_ANDROID) 185 #if defined(OS_ANDROID)
186 registry->RegisterBooleanPref( 186 registry->RegisterBooleanPref(
187 prefs::kDevToolsRemoteEnabled, 187 prefs::kDevToolsRemoteEnabled,
188 false, 188 false,
189 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 189 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
190 #endif 190 #endif
191 #if defined(OS_ANDROID) || defined(OS_IOS) 191 #if defined(SPDY_PROXY_AUTH_ORIGIN)
192 data_reduction_proxy::RegisterSyncableProfilePrefs(registry); 192 data_reduction_proxy::RegisterSyncableProfilePrefs(registry);
193 #endif // defined(OS_ANDROID) || defined(OS_IOS) 193 #endif // defined(SPDY_PROXY_AUTH_ORIGIN)
194 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) && !defined(OS_IOS) 194 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) && !defined(OS_IOS)
195 // Preferences related to the avatar bubble and user manager tutorials. 195 // Preferences related to the avatar bubble and user manager tutorials.
196 registry->RegisterIntegerPref( 196 registry->RegisterIntegerPref(
197 prefs::kProfileAvatarTutorialShown, 197 prefs::kProfileAvatarTutorialShown,
198 0, 198 0,
199 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 199 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
200 registry->RegisterBooleanPref( 200 registry->RegisterBooleanPref(
201 prefs::kProfileUserManagerTutorialShown, 201 prefs::kProfileUserManagerTutorialShown,
202 false, 202 false,
203 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 203 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 content::NotificationService::NoDetails()); 250 content::NotificationService::NoDetails());
251 } 251 }
252 } 252 }
253 253
254 bool ProfileCompare::operator()(Profile* a, Profile* b) const { 254 bool ProfileCompare::operator()(Profile* a, Profile* b) const {
255 DCHECK(a && b); 255 DCHECK(a && b);
256 if (a->IsSameProfile(b)) 256 if (a->IsSameProfile(b))
257 return false; 257 return false;
258 return a->GetOriginalProfile() < b->GetOriginalProfile(); 258 return a->GetOriginalProfile() < b->GetOriginalProfile();
259 } 259 }
OLDNEW
« no previous file with comments | « chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.cc ('k') | chrome/browser/profiles/profile_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698