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

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

Issue 1081403002: Refactor safe-browsing build-config definitions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase again to fix collision Created 5 years, 8 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_impl_io_data.h" 5 #include "chrome/browser/profiles/profile_impl_io_data.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 io_data_->http_server_properties_manager_ = 365 io_data_->http_server_properties_manager_ =
366 chrome_browser_net::HttpServerPropertiesManagerFactory::CreateManager( 366 chrome_browser_net::HttpServerPropertiesManagerFactory::CreateManager(
367 pref_service); 367 pref_service);
368 io_data_->set_http_server_properties( 368 io_data_->set_http_server_properties(
369 scoped_ptr<net::HttpServerProperties>( 369 scoped_ptr<net::HttpServerProperties>(
370 io_data_->http_server_properties_manager_)); 370 io_data_->http_server_properties_manager_));
371 io_data_->session_startup_pref()->Init( 371 io_data_->session_startup_pref()->Init(
372 prefs::kRestoreOnStartup, pref_service); 372 prefs::kRestoreOnStartup, pref_service);
373 io_data_->session_startup_pref()->MoveToThread( 373 io_data_->session_startup_pref()->MoveToThread(
374 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); 374 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
375 #if defined(FULL_SAFE_BROWSING) || defined(MOBILE_SAFE_BROWSING) 375 #if defined(SAFE_BROWSING_SERVICE)
376 io_data_->safe_browsing_enabled()->Init(prefs::kSafeBrowsingEnabled, 376 io_data_->safe_browsing_enabled()->Init(prefs::kSafeBrowsingEnabled,
377 pref_service); 377 pref_service);
378 io_data_->safe_browsing_enabled()->MoveToThread( 378 io_data_->safe_browsing_enabled()->MoveToThread(
379 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); 379 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
380 #endif 380 #endif
381 io_data_->InitializeOnUIThread(profile_); 381 io_data_->InitializeOnUIThread(profile_);
382 } 382 }
383 383
384 scoped_ptr<ProfileIOData::ChromeURLRequestContextGetterVector> 384 scoped_ptr<ProfileIOData::ChromeURLRequestContextGetterVector>
385 ProfileImplIOData::Handle::GetAllContextGetters() { 385 ProfileImplIOData::Handle::GetAllContextGetters() {
(...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after
805 const base::Closure& completion) { 805 const base::Closure& completion) {
806 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 806 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
807 DCHECK(initialized()); 807 DCHECK(initialized());
808 808
809 DCHECK(transport_security_state()); 809 DCHECK(transport_security_state());
810 // Completes synchronously. 810 // Completes synchronously.
811 transport_security_state()->DeleteAllDynamicDataSince(time); 811 transport_security_state()->DeleteAllDynamicDataSince(time);
812 DCHECK(http_server_properties_manager_); 812 DCHECK(http_server_properties_manager_);
813 http_server_properties_manager_->Clear(completion); 813 http_server_properties_manager_->Clear(completion);
814 } 814 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698