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

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

Issue 2451573003: [Media Router] Update Media Router flags post-launch. (Closed)
Patch Set: Created 4 years, 1 month 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 "build/build_config.h" 9 #include "build/build_config.h"
10 #include "chrome/browser/chrome_notification_types.h" 10 #include "chrome/browser/chrome_notification_types.h"
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 registry->RegisterIntegerPref(prefs::kProfileAvatarTutorialShown, 0); 147 registry->RegisterIntegerPref(prefs::kProfileAvatarTutorialShown, 0);
148 #endif 148 #endif
149 149
150 #if defined(OS_ANDROID) 150 #if defined(OS_ANDROID)
151 registry->RegisterBooleanPref(prefs::kClickedUpdateMenuItem, false); 151 registry->RegisterBooleanPref(prefs::kClickedUpdateMenuItem, false);
152 registry->RegisterStringPref(prefs::kLatestVersionWhenClickedUpdateMenuItem, 152 registry->RegisterStringPref(prefs::kLatestVersionWhenClickedUpdateMenuItem,
153 std::string()); 153 std::string());
154 #endif 154 #endif
155 155
156 #if defined(ENABLE_MEDIA_ROUTER) 156 #if defined(ENABLE_MEDIA_ROUTER)
157 #if defined(GOOGLE_CHROME_BUILD)
158 registry->RegisterBooleanPref( 157 registry->RegisterBooleanPref(
159 prefs::kMediaRouterCloudServicesPrefSet, 158 prefs::kMediaRouterCloudServicesPrefSet,
160 false, 159 false,
161 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 160 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
162 registry->RegisterBooleanPref( 161 registry->RegisterBooleanPref(
163 prefs::kMediaRouterEnableCloudServices, 162 prefs::kMediaRouterEnableCloudServices,
164 false, 163 false,
165 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 164 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
166 #endif // defined(GOOGLE_CHROME_BUILD)
167 registry->RegisterBooleanPref( 165 registry->RegisterBooleanPref(
168 prefs::kMediaRouterFirstRunFlowAcknowledged, 166 prefs::kMediaRouterFirstRunFlowAcknowledged,
169 false, 167 false,
170 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 168 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
171 #endif 169 #endif
172 170
173 #if defined(OS_CHROMEOS) 171 #if defined(OS_CHROMEOS)
174 registry->RegisterBooleanPref(prefs::kAllowScreenLock, true); 172 registry->RegisterBooleanPref(prefs::kAllowScreenLock, true);
175 #endif 173 #endif
176 } 174 }
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 if (a->IsSameProfile(b)) 234 if (a->IsSameProfile(b))
237 return false; 235 return false;
238 return a->GetOriginalProfile() < b->GetOriginalProfile(); 236 return a->GetOriginalProfile() < b->GetOriginalProfile();
239 } 237 }
240 238
241 double Profile::GetDefaultZoomLevelForProfile() { 239 double Profile::GetDefaultZoomLevelForProfile() {
242 return GetDefaultStoragePartition(this) 240 return GetDefaultStoragePartition(this)
243 ->GetHostZoomMap() 241 ->GetHostZoomMap()
244 ->GetDefaultZoomLevel(); 242 ->GetDefaultZoomLevel();
245 } 243 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698