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

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

Issue 11316163: Remove the last usages of PrefObserver outside of Prefs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix build. Created 8 years 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_io_data.h" 5 #include "chrome/browser/profiles/profile_impl_io_data.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/file_util.h" 9 #include "base/file_util.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 if (initialized_) 263 if (initialized_)
264 return; 264 return;
265 265
266 // Set initialized_ to true at the beginning in case any of the objects 266 // Set initialized_ to true at the beginning in case any of the objects
267 // below try to get the ResourceContext pointer. 267 // below try to get the ResourceContext pointer.
268 initialized_ = true; 268 initialized_ = true;
269 PrefService* pref_service = profile_->GetPrefs(); 269 PrefService* pref_service = profile_->GetPrefs();
270 io_data_->set_http_server_properties_manager( 270 io_data_->set_http_server_properties_manager(
271 new chrome_browser_net::HttpServerPropertiesManager(pref_service)); 271 new chrome_browser_net::HttpServerPropertiesManager(pref_service));
272 io_data_->session_startup_pref()->Init( 272 io_data_->session_startup_pref()->Init(
273 prefs::kRestoreOnStartup, pref_service, NULL); 273 prefs::kRestoreOnStartup, pref_service);
274 io_data_->session_startup_pref()->MoveToThread( 274 io_data_->session_startup_pref()->MoveToThread(
275 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); 275 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
276 #if defined(FULL_SAFE_BROWSING) || defined(MOBILE_SAFE_BROWSING) 276 #if defined(FULL_SAFE_BROWSING) || defined(MOBILE_SAFE_BROWSING)
277 io_data_->safe_browsing_enabled()->Init(prefs::kSafeBrowsingEnabled, 277 io_data_->safe_browsing_enabled()->Init(prefs::kSafeBrowsingEnabled,
278 pref_service, NULL); 278 pref_service);
279 io_data_->safe_browsing_enabled()->MoveToThread( 279 io_data_->safe_browsing_enabled()->MoveToThread(
280 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); 280 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
281 #endif 281 #endif
282 io_data_->InitializeOnUIThread(profile_); 282 io_data_->InitializeOnUIThread(profile_);
283 } 283 }
284 284
285 ProfileImplIOData::LazyParams::LazyParams() 285 ProfileImplIOData::LazyParams::LazyParams()
286 : cache_max_size(0), 286 : cache_max_size(0),
287 media_cache_max_size(0), 287 media_cache_max_size(0),
288 restore_old_session_cookies(false) {} 288 restore_old_session_cookies(false) {}
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
676 base::Time time, 676 base::Time time,
677 const base::Closure& completion) { 677 const base::Closure& completion) {
678 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 678 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
679 LazyInitialize(); 679 LazyInitialize();
680 680
681 DCHECK(transport_security_state()); 681 DCHECK(transport_security_state());
682 transport_security_state()->DeleteSince(time); // Completes synchronously. 682 transport_security_state()->DeleteSince(time); // Completes synchronously.
683 DCHECK(http_server_properties_manager()); 683 DCHECK(http_server_properties_manager());
684 http_server_properties_manager()->Clear(completion); 684 http_server_properties_manager()->Clear(completion);
685 } 685 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698