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

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

Issue 2487673003: [Media Router] Make per-hostname cast mode selections persist (Closed)
Patch Set: Address Jennifer's comments, rebase 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 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 false, 162 false,
163 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 163 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
164 registry->RegisterBooleanPref( 164 registry->RegisterBooleanPref(
165 prefs::kMediaRouterEnableCloudServices, 165 prefs::kMediaRouterEnableCloudServices,
166 false, 166 false,
167 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 167 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
168 registry->RegisterBooleanPref( 168 registry->RegisterBooleanPref(
169 prefs::kMediaRouterFirstRunFlowAcknowledged, 169 prefs::kMediaRouterFirstRunFlowAcknowledged,
170 false, 170 false,
171 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 171 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
172 registry->RegisterDictionaryPref(prefs::kMediaRouterCastModeSelections);
172 #endif 173 #endif
173 174
174 #if defined(OS_CHROMEOS) 175 #if defined(OS_CHROMEOS)
175 registry->RegisterBooleanPref(prefs::kAllowScreenLock, true); 176 registry->RegisterBooleanPref(prefs::kAllowScreenLock, true);
176 #endif 177 #endif
177 } 178 }
178 179
179 std::string Profile::GetDebugName() { 180 std::string Profile::GetDebugName() {
180 std::string name = GetPath().BaseName().MaybeAsASCII(); 181 std::string name = GetPath().BaseName().MaybeAsASCII();
181 if (name.empty()) { 182 if (name.empty()) {
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 if (a->IsSameProfile(b)) 238 if (a->IsSameProfile(b))
238 return false; 239 return false;
239 return a->GetOriginalProfile() < b->GetOriginalProfile(); 240 return a->GetOriginalProfile() < b->GetOriginalProfile();
240 } 241 }
241 242
242 double Profile::GetDefaultZoomLevelForProfile() { 243 double Profile::GetDefaultZoomLevelForProfile() {
243 return GetDefaultStoragePartition(this) 244 return GetDefaultStoragePartition(this)
244 ->GetHostZoomMap() 245 ->GetHostZoomMap()
245 ->GetDefaultZoomLevel(); 246 ->GetDefaultZoomLevel();
246 } 247 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698