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

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

Issue 6905044: Refactor preference syncing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Really fix. And rebase Created 9 years, 7 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
« no previous file with comments | « chrome/browser/profiles/profile.cc ('k') | chrome/browser/search_engines/template_url_model.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/command_line.h" 7 #include "base/command_line.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/environment.h" 9 #include "base/environment.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 BrowserThread::PostTask(BrowserThread::FILE, 250 BrowserThread::PostTask(BrowserThread::FILE,
251 FROM_HERE, 251 FROM_HERE,
252 NewRunnableFunction(&file_util::CreateDirectory, 252 NewRunnableFunction(&file_util::CreateDirectory,
253 path)); 253 path));
254 // Async version. 254 // Async version.
255 return new ProfileImpl(path, delegate); 255 return new ProfileImpl(path, delegate);
256 } 256 }
257 257
258 // static 258 // static
259 void ProfileImpl::RegisterUserPrefs(PrefService* prefs) { 259 void ProfileImpl::RegisterUserPrefs(PrefService* prefs) {
260 prefs->RegisterBooleanPref(prefs::kSavingBrowserHistoryDisabled, false); 260 prefs->RegisterBooleanPref(prefs::kSavingBrowserHistoryDisabled,
261 prefs->RegisterBooleanPref(prefs::kClearSiteDataOnExit, false); 261 false,
262 PrefService::UNSYNCABLE_PREF);
263 prefs->RegisterBooleanPref(prefs::kClearSiteDataOnExit,
264 false,
265 PrefService::SYNCABLE_PREF);
262 } 266 }
263 267
264 ProfileImpl::ProfileImpl(const FilePath& path, 268 ProfileImpl::ProfileImpl(const FilePath& path,
265 Profile::Delegate* delegate) 269 Profile::Delegate* delegate)
266 : path_(path), 270 : path_(path),
267 visited_link_event_listener_(new VisitedLinkEventListener()), 271 visited_link_event_listener_(new VisitedLinkEventListener()),
268 extension_devtools_manager_(NULL), 272 extension_devtools_manager_(NULL),
269 ALLOW_THIS_IN_INITIALIZER_LIST(io_data_(this)), 273 ALLOW_THIS_IN_INITIALIZER_LIST(io_data_(this)),
270 host_content_settings_map_(NULL), 274 host_content_settings_map_(NULL),
271 host_zoom_map_(NULL), 275 host_zoom_map_(NULL),
(...skipping 1275 matching lines...) Expand 10 before | Expand all | Expand 10 after
1547 return pref_proxy_config_tracker_; 1551 return pref_proxy_config_tracker_;
1548 } 1552 }
1549 1553
1550 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() { 1554 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() {
1551 if (!prerender::PrerenderManager::IsPrerenderingPossible()) 1555 if (!prerender::PrerenderManager::IsPrerenderingPossible())
1552 return NULL; 1556 return NULL;
1553 if (!prerender_manager_.get()) 1557 if (!prerender_manager_.get())
1554 prerender_manager_.reset(new prerender::PrerenderManager(this)); 1558 prerender_manager_.reset(new prerender::PrerenderManager(this));
1555 return prerender_manager_.get(); 1559 return prerender_manager_.get();
1556 } 1560 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile.cc ('k') | chrome/browser/search_engines/template_url_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698