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

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

Issue 10689116: Cleanup: better session restore UI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 8 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 | Annotate | Revision Log
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_impl.h" 5 #include "chrome/browser/profiles/profile_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/environment.h" 10 #include "base/environment.h"
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 PrefService::UNSYNCABLE_PREF); 212 PrefService::UNSYNCABLE_PREF);
213 prefs->RegisterBooleanPref(prefs::kProfileShortcutCreated, 213 prefs->RegisterBooleanPref(prefs::kProfileShortcutCreated,
214 false, 214 false,
215 PrefService::UNSYNCABLE_PREF); 215 PrefService::UNSYNCABLE_PREF);
216 prefs->RegisterIntegerPref(prefs::kProfileAvatarIndex, 216 prefs->RegisterIntegerPref(prefs::kProfileAvatarIndex,
217 -1, 217 -1,
218 PrefService::SYNCABLE_PREF); 218 PrefService::SYNCABLE_PREF);
219 prefs->RegisterStringPref(prefs::kProfileName, 219 prefs->RegisterStringPref(prefs::kProfileName,
220 "", 220 "",
221 PrefService::SYNCABLE_PREF); 221 PrefService::SYNCABLE_PREF);
222 prefs->RegisterBooleanPref(prefs::kRestoreSessionStateDialogShown,
223 false,
224 PrefService::SYNCABLE_PREF);
225 prefs->RegisterStringPref(prefs::kHomePage, 222 prefs->RegisterStringPref(prefs::kHomePage,
226 std::string(), 223 std::string(),
227 PrefService::SYNCABLE_PREF); 224 PrefService::SYNCABLE_PREF);
228 225
229 // Initialize the cache prefs. 226 // Initialize the cache prefs.
230 prefs->RegisterFilePathPref(prefs::kDiskCacheDir, 227 prefs->RegisterFilePathPref(prefs::kDiskCacheDir,
231 FilePath(), 228 FilePath(),
232 PrefService::UNSYNCABLE_PREF); 229 PrefService::UNSYNCABLE_PREF);
233 prefs->RegisterIntegerPref(prefs::kDiskCacheSize, 230 prefs->RegisterIntegerPref(prefs::kDiskCacheSize,
234 0, 231 0,
(...skipping 873 matching lines...) Expand 10 before | Expand all | Expand 10 after
1108 if (!path.empty()) 1105 if (!path.empty())
1109 *cache_path = path; 1106 *cache_path = path;
1110 *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) : 1107 *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) :
1111 prefs_->GetInteger(prefs::kDiskCacheSize); 1108 prefs_->GetInteger(prefs::kDiskCacheSize);
1112 } 1109 }
1113 1110
1114 base::Callback<ChromeURLDataManagerBackend*(void)> 1111 base::Callback<ChromeURLDataManagerBackend*(void)>
1115 ProfileImpl::GetChromeURLDataManagerBackendGetter() const { 1112 ProfileImpl::GetChromeURLDataManagerBackendGetter() const {
1116 return io_data_.GetChromeURLDataManagerBackendGetter(); 1113 return io_data_.GetChromeURLDataManagerBackendGetter();
1117 } 1114 }
OLDNEW
« no previous file with comments | « chrome/app/google_chrome_strings.grd ('k') | chrome/browser/resources/options2/browser_options.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698