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

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

Issue 387003008: ifdef extensions code in BrowserProcess, IOThread, and ChromeNetworkDelegate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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_io_data.h" 5 #include "chrome/browser/profiles/profile_io_data.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 972 matching lines...) Expand 10 before | Expand all | Expand 10 after
983 IOThread* const io_thread = profile_params_->io_thread; 983 IOThread* const io_thread = profile_params_->io_thread;
984 IOThread::Globals* const io_thread_globals = io_thread->globals(); 984 IOThread::Globals* const io_thread_globals = io_thread->globals();
985 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); 985 const CommandLine& command_line = *CommandLine::ForCurrentProcess();
986 986
987 // Create the common request contexts. 987 // Create the common request contexts.
988 main_request_context_.reset(new ChromeURLRequestContext()); 988 main_request_context_.reset(new ChromeURLRequestContext());
989 extensions_request_context_.reset(new ChromeURLRequestContext()); 989 extensions_request_context_.reset(new ChromeURLRequestContext());
990 990
991 ChromeNetworkDelegate* network_delegate = 991 ChromeNetworkDelegate* network_delegate =
992 new ChromeNetworkDelegate( 992 new ChromeNetworkDelegate(
993 #if defined(ENABLE_EXTENSIONS)
993 io_thread_globals->extension_event_router_forwarder.get(), 994 io_thread_globals->extension_event_router_forwarder.get(),
995 #else
996 NULL,
997 #endif
994 &enable_referrers_); 998 &enable_referrers_);
995 network_delegate->set_data_reduction_proxy_params( 999 network_delegate->set_data_reduction_proxy_params(
996 io_thread_globals->data_reduction_proxy_params.get()); 1000 io_thread_globals->data_reduction_proxy_params.get());
997 network_delegate->set_data_reduction_proxy_usage_stats( 1001 network_delegate->set_data_reduction_proxy_usage_stats(
998 io_thread_globals->data_reduction_proxy_usage_stats.get()); 1002 io_thread_globals->data_reduction_proxy_usage_stats.get());
999 network_delegate->set_data_reduction_proxy_auth_request_handler( 1003 network_delegate->set_data_reduction_proxy_auth_request_handler(
1000 io_thread_globals->data_reduction_proxy_auth_request_handler.get()); 1004 io_thread_globals->data_reduction_proxy_auth_request_handler.get());
1001 network_delegate->set_on_resolve_proxy_handler( 1005 network_delegate->set_on_resolve_proxy_handler(
1002 io_thread_globals->on_resolve_proxy_handler); 1006 io_thread_globals->on_resolve_proxy_handler);
1003 if (command_line.HasSwitch(switches::kEnableClientHints)) 1007 if (command_line.HasSwitch(switches::kEnableClientHints))
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
1251 void ProfileIOData::SetCookieSettingsForTesting( 1255 void ProfileIOData::SetCookieSettingsForTesting(
1252 CookieSettings* cookie_settings) { 1256 CookieSettings* cookie_settings) {
1253 DCHECK(!cookie_settings_.get()); 1257 DCHECK(!cookie_settings_.get());
1254 cookie_settings_ = cookie_settings; 1258 cookie_settings_ = cookie_settings;
1255 } 1259 }
1256 1260
1257 void ProfileIOData::set_signin_names_for_testing( 1261 void ProfileIOData::set_signin_names_for_testing(
1258 SigninNamesOnIOThread* signin_names) { 1262 SigninNamesOnIOThread* signin_names) {
1259 signin_names_.reset(signin_names); 1263 signin_names_.reset(signin_names);
1260 } 1264 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698