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

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

Issue 2155293002: Show the Cast toolbar icon ephemerally when Cast is in use (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address Mark's comment, trybot failures, rebase Created 4 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 "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 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 160 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
161 registry->RegisterBooleanPref( 161 registry->RegisterBooleanPref(
162 prefs::kMediaRouterEnableCloudServices, 162 prefs::kMediaRouterEnableCloudServices,
163 false, 163 false,
164 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 164 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
165 #endif // defined(GOOGLE_CHROME_BUILD) 165 #endif // defined(GOOGLE_CHROME_BUILD)
166 registry->RegisterBooleanPref( 166 registry->RegisterBooleanPref(
167 prefs::kMediaRouterFirstRunFlowAcknowledged, 167 prefs::kMediaRouterFirstRunFlowAcknowledged,
168 false, 168 false,
169 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 169 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
170 registry->RegisterBooleanPref(
171 prefs::kMediaRouterAlwaysShowActionIcon,
172 false,
173 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
170 #endif 174 #endif
171 175
172 #if defined(OS_CHROMEOS) 176 #if defined(OS_CHROMEOS)
173 registry->RegisterBooleanPref(prefs::kAllowScreenLock, true); 177 registry->RegisterBooleanPref(prefs::kAllowScreenLock, true);
174 #endif 178 #endif
175 } 179 }
176 180
177 std::string Profile::GetDebugName() { 181 std::string Profile::GetDebugName() {
178 std::string name = GetPath().BaseName().MaybeAsASCII(); 182 std::string name = GetPath().BaseName().MaybeAsASCII();
179 if (name.empty()) { 183 if (name.empty()) {
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 if (a->IsSameProfile(b)) 238 if (a->IsSameProfile(b))
235 return false; 239 return false;
236 return a->GetOriginalProfile() < b->GetOriginalProfile(); 240 return a->GetOriginalProfile() < b->GetOriginalProfile();
237 } 241 }
238 242
239 double Profile::GetDefaultZoomLevelForProfile() { 243 double Profile::GetDefaultZoomLevelForProfile() {
240 return GetDefaultStoragePartition(this) 244 return GetDefaultStoragePartition(this)
241 ->GetHostZoomMap() 245 ->GetHostZoomMap()
242 ->GetDefaultZoomLevel(); 246 ->GetDefaultZoomLevel();
243 } 247 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698