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

Side by Side Diff: chrome/browser/io_thread.cc

Issue 10824257: Add ManagedModeURLFilter. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: compile fix Created 8 years, 4 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/io_thread.h" 5 #include "chrome/browser/io_thread.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 net::NetworkChangeNotifier::InitHistogramWatcher(); 399 net::NetworkChangeNotifier::InitHistogramWatcher();
400 400
401 globals_->extension_event_router_forwarder = 401 globals_->extension_event_router_forwarder =
402 extension_event_router_forwarder_; 402 extension_event_router_forwarder_;
403 ChromeNetworkDelegate* network_delegate = new ChromeNetworkDelegate( 403 ChromeNetworkDelegate* network_delegate = new ChromeNetworkDelegate(
404 extension_event_router_forwarder_, 404 extension_event_router_forwarder_,
405 NULL, 405 NULL,
406 NULL, 406 NULL,
407 NULL, 407 NULL,
408 NULL, 408 NULL,
409 NULL,
409 &system_enable_referrers_, 410 &system_enable_referrers_,
410 NULL); 411 NULL);
411 if (CommandLine::ForCurrentProcess()->HasSwitch( 412 if (CommandLine::ForCurrentProcess()->HasSwitch(
412 switches::kDisableExtensionsHttpThrottling)) { 413 switches::kDisableExtensionsHttpThrottling)) {
413 network_delegate->NeverThrottleRequests(); 414 network_delegate->NeverThrottleRequests();
414 } 415 }
415 globals_->system_network_delegate.reset(network_delegate); 416 globals_->system_network_delegate.reset(network_delegate);
416 globals_->host_resolver.reset( 417 globals_->host_resolver.reset(
417 CreateGlobalHostResolver(net_log_)); 418 CreateGlobalHostResolver(net_log_));
418 globals_->cert_verifier.reset(net::CertVerifier::CreateDefault()); 419 globals_->cert_verifier.reset(net::CertVerifier::CreateDefault());
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
630 new net::HttpNetworkLayer( 631 new net::HttpNetworkLayer(
631 new net::HttpNetworkSession(system_params))); 632 new net::HttpNetworkSession(system_params)));
632 globals_->system_ftp_transaction_factory.reset( 633 globals_->system_ftp_transaction_factory.reset(
633 new net::FtpNetworkLayer(globals_->host_resolver.get())); 634 new net::FtpNetworkLayer(globals_->host_resolver.get()));
634 globals_->system_request_context.reset( 635 globals_->system_request_context.reset(
635 ConstructSystemRequestContext(globals_, net_log_)); 636 ConstructSystemRequestContext(globals_, net_log_));
636 637
637 sdch_manager_->set_sdch_fetcher( 638 sdch_manager_->set_sdch_fetcher(
638 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); 639 new SdchDictionaryFetcher(system_url_request_context_getter_.get()));
639 } 640 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/web_request/web_request_api_unittest.cc ('k') | chrome/browser/managed_mode.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698