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

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

Issue 2760403003: Remove enable_media_router. (Closed)
Patch Set: . Created 3 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
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 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 // Preferences related to the avatar bubble and user manager tutorials. 154 // Preferences related to the avatar bubble and user manager tutorials.
155 registry->RegisterIntegerPref(prefs::kProfileAvatarTutorialShown, 0); 155 registry->RegisterIntegerPref(prefs::kProfileAvatarTutorialShown, 0);
156 #endif 156 #endif
157 157
158 #if defined(OS_ANDROID) 158 #if defined(OS_ANDROID)
159 registry->RegisterBooleanPref(prefs::kClickedUpdateMenuItem, false); 159 registry->RegisterBooleanPref(prefs::kClickedUpdateMenuItem, false);
160 registry->RegisterStringPref(prefs::kLatestVersionWhenClickedUpdateMenuItem, 160 registry->RegisterStringPref(prefs::kLatestVersionWhenClickedUpdateMenuItem,
161 std::string()); 161 std::string());
162 #endif 162 #endif
163 163
164 #if defined(ENABLE_MEDIA_ROUTER)
165 registry->RegisterBooleanPref( 164 registry->RegisterBooleanPref(
166 prefs::kMediaRouterCloudServicesPrefSet, 165 prefs::kMediaRouterCloudServicesPrefSet,
167 false, 166 false,
168 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 167 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
169 registry->RegisterBooleanPref( 168 registry->RegisterBooleanPref(
170 prefs::kMediaRouterEnableCloudServices, 169 prefs::kMediaRouterEnableCloudServices,
171 false, 170 false,
172 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 171 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
173 registry->RegisterBooleanPref( 172 registry->RegisterBooleanPref(
174 prefs::kMediaRouterFirstRunFlowAcknowledged, 173 prefs::kMediaRouterFirstRunFlowAcknowledged,
175 false, 174 false,
176 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 175 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
177 registry->RegisterListPref(prefs::kMediaRouterTabMirroringSources); 176 registry->RegisterListPref(prefs::kMediaRouterTabMirroringSources);
178 #endif
179 177
180 #if defined(OS_CHROMEOS) 178 #if defined(OS_CHROMEOS)
181 registry->RegisterBooleanPref(prefs::kAllowScreenLock, true); 179 registry->RegisterBooleanPref(prefs::kAllowScreenLock, true);
182 #endif 180 #endif
183 181
184 registry->RegisterDictionaryPref(prefs::kWebShareVisitedTargets); 182 registry->RegisterDictionaryPref(prefs::kWebShareVisitedTargets);
185 registry->RegisterDictionaryPref(prefs::kExcludedSchemes); 183 registry->RegisterDictionaryPref(prefs::kExcludedSchemes);
186 } 184 }
187 185
188 std::string Profile::GetDebugName() { 186 std::string Profile::GetDebugName() {
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 if (a->IsSameProfile(b)) 244 if (a->IsSameProfile(b))
247 return false; 245 return false;
248 return a->GetOriginalProfile() < b->GetOriginalProfile(); 246 return a->GetOriginalProfile() < b->GetOriginalProfile();
249 } 247 }
250 248
251 double Profile::GetDefaultZoomLevelForProfile() { 249 double Profile::GetDefaultZoomLevelForProfile() {
252 return GetDefaultStoragePartition(this) 250 return GetDefaultStoragePartition(this)
253 ->GetHostZoomMap() 251 ->GetHostZoomMap()
254 ->GetDefaultZoomLevel(); 252 ->GetDefaultZoomLevel();
255 } 253 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698