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

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

Issue 14137032: Create profile .ico file on profile creation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix merge Created 7 years, 5 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 "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 prefs::kDefaultZoomLevel, 104 prefs::kDefaultZoomLevel,
105 0.0, 105 0.0,
106 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 106 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
107 registry->RegisterDictionaryPref( 107 registry->RegisterDictionaryPref(
108 prefs::kPerHostZoomLevels, 108 prefs::kPerHostZoomLevels,
109 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 109 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
110 registry->RegisterStringPref( 110 registry->RegisterStringPref(
111 prefs::kDefaultApps, 111 prefs::kDefaultApps,
112 "install", 112 "install",
113 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 113 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
114 registry->RegisterIntegerPref(
115 prefs::kProfileIconVersion,
116 0,
117 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
114 #if defined(OS_CHROMEOS) 118 #if defined(OS_CHROMEOS)
115 // TODO(dilmah): For OS_CHROMEOS we maintain kApplicationLocale in both 119 // TODO(dilmah): For OS_CHROMEOS we maintain kApplicationLocale in both
116 // local state and user's profile. For other platforms we maintain 120 // local state and user's profile. For other platforms we maintain
117 // kApplicationLocale only in local state. 121 // kApplicationLocale only in local state.
118 // In the future we may want to maintain kApplicationLocale 122 // In the future we may want to maintain kApplicationLocale
119 // in user's profile for other platforms as well. 123 // in user's profile for other platforms as well.
120 registry->RegisterStringPref(prefs::kApplicationLocale, 124 registry->RegisterStringPref(prefs::kApplicationLocale,
121 std::string(), 125 std::string(),
122 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 126 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
123 registry->RegisterStringPref( 127 registry->RegisterStringPref(
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 193
190 void Profile::MaybeSendDestroyedNotification() { 194 void Profile::MaybeSendDestroyedNotification() {
191 if (!sent_destroyed_notification_) { 195 if (!sent_destroyed_notification_) {
192 sent_destroyed_notification_ = true; 196 sent_destroyed_notification_ = true;
193 content::NotificationService::current()->Notify( 197 content::NotificationService::current()->Notify(
194 chrome::NOTIFICATION_PROFILE_DESTROYED, 198 chrome::NOTIFICATION_PROFILE_DESTROYED,
195 content::Source<Profile>(this), 199 content::Source<Profile>(this),
196 content::NotificationService::NoDetails()); 200 content::NotificationService::NoDetails());
197 } 201 }
198 } 202 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698