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

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

Issue 2639463002: Add a pref name for share targets, and store their manifest data. (Closed)
Patch Set: Added tests. Created 3 years, 11 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 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 registry->RegisterBooleanPref( 169 registry->RegisterBooleanPref(
170 prefs::kMediaRouterFirstRunFlowAcknowledged, 170 prefs::kMediaRouterFirstRunFlowAcknowledged,
171 false, 171 false,
172 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 172 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
173 registry->RegisterListPref(prefs::kMediaRouterTabMirroringSources); 173 registry->RegisterListPref(prefs::kMediaRouterTabMirroringSources);
174 #endif 174 #endif
175 175
176 #if defined(OS_CHROMEOS) 176 #if defined(OS_CHROMEOS)
177 registry->RegisterBooleanPref(prefs::kAllowScreenLock, true); 177 registry->RegisterBooleanPref(prefs::kAllowScreenLock, true);
178 #endif 178 #endif
179
180 #if defined(OS_WIN) || defined(OS_LINUX)
Matt Giuca 2017/01/23 03:00:57 I don't think this OS check is appropriate. If we
constantina 2017/01/24 02:03:42 Done.
181 registry->RegisterDictionaryPref(prefs::kWebShareVisitedTargets);
182 #endif
179 } 183 }
180 184
181 std::string Profile::GetDebugName() { 185 std::string Profile::GetDebugName() {
182 std::string name = GetPath().BaseName().MaybeAsASCII(); 186 std::string name = GetPath().BaseName().MaybeAsASCII();
183 if (name.empty()) { 187 if (name.empty()) {
184 name = "UnknownProfile"; 188 name = "UnknownProfile";
185 } 189 }
186 return name; 190 return name;
187 } 191 }
188 192
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 if (a->IsSameProfile(b)) 243 if (a->IsSameProfile(b))
240 return false; 244 return false;
241 return a->GetOriginalProfile() < b->GetOriginalProfile(); 245 return a->GetOriginalProfile() < b->GetOriginalProfile();
242 } 246 }
243 247
244 double Profile::GetDefaultZoomLevelForProfile() { 248 double Profile::GetDefaultZoomLevelForProfile() {
245 return GetDefaultStoragePartition(this) 249 return GetDefaultStoragePartition(this)
246 ->GetHostZoomMap() 250 ->GetHostZoomMap()
247 ->GetDefaultZoomLevel(); 251 ->GetDefaultZoomLevel();
248 } 252 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698