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

Side by Side Diff: chrome/browser/profiles/profile_io_data.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
« no previous file with comments | « chrome/browser/net/chrome_network_delegate_unittest.cc ('k') | chrome/chrome_browser.gypi » ('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) 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 #include "net/cookies/canonical_cookie.h" 57 #include "net/cookies/canonical_cookie.h"
58 #include "net/cookies/cookie_monster.h" 58 #include "net/cookies/cookie_monster.h"
59 #include "net/http/http_transaction_factory.h" 59 #include "net/http/http_transaction_factory.h"
60 #include "net/http/http_util.h" 60 #include "net/http/http_util.h"
61 #include "net/proxy/proxy_config_service_fixed.h" 61 #include "net/proxy/proxy_config_service_fixed.h"
62 #include "net/proxy/proxy_script_fetcher_impl.h" 62 #include "net/proxy/proxy_script_fetcher_impl.h"
63 #include "net/proxy/proxy_service.h" 63 #include "net/proxy/proxy_service.h"
64 #include "net/url_request/data_protocol_handler.h" 64 #include "net/url_request/data_protocol_handler.h"
65 #include "net/url_request/url_request.h" 65 #include "net/url_request/url_request.h"
66 66
67 #if !defined(OS_ANDROID)
68 #include "chrome/browser/managed_mode.h"
69 #endif
70
67 #if defined(OS_CHROMEOS) 71 #if defined(OS_CHROMEOS)
68 #include "chrome/browser/chromeos/gdata/gdata_protocol_handler.h" 72 #include "chrome/browser/chromeos/gdata/gdata_protocol_handler.h"
69 #include "chrome/browser/chromeos/gview_request_interceptor.h" 73 #include "chrome/browser/chromeos/gview_request_interceptor.h"
70 #include "chrome/browser/chromeos/proxy_config_service_impl.h" 74 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
71 #include "chrome/browser/chromeos/settings/cros_settings.h" 75 #include "chrome/browser/chromeos/settings/cros_settings.h"
72 #include "chrome/browser/chromeos/settings/cros_settings_names.h" 76 #include "chrome/browser/chromeos/settings/cros_settings_names.h"
73 #endif // defined(OS_CHROMEOS) 77 #endif // defined(OS_CHROMEOS)
74 78
75 using content::BrowserContext; 79 using content::BrowserContext;
76 using content::BrowserThread; 80 using content::BrowserThread;
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
472 new ChromeURLRequestContext( 476 new ChromeURLRequestContext(
473 ChromeURLRequestContext::CONTEXT_TYPE_EXTENSIONS, 477 ChromeURLRequestContext::CONTEXT_TYPE_EXTENSIONS,
474 cache_stats_)); 478 cache_stats_));
475 479
476 chrome_url_data_manager_backend_.reset(new ChromeURLDataManagerBackend); 480 chrome_url_data_manager_backend_.reset(new ChromeURLDataManagerBackend);
477 481
478 network_delegate_.reset(new ChromeNetworkDelegate( 482 network_delegate_.reset(new ChromeNetworkDelegate(
479 io_thread_globals->extension_event_router_forwarder.get(), 483 io_thread_globals->extension_event_router_forwarder.get(),
480 profile_params_->extension_info_map, 484 profile_params_->extension_info_map,
481 url_blacklist_manager_.get(), 485 url_blacklist_manager_.get(),
486 #if !defined(OS_ANDROID)
487 ManagedMode::GetURLFilter(),
488 #else
489 NULL,
490 #endif
482 profile_params_->profile, 491 profile_params_->profile,
483 profile_params_->cookie_settings, 492 profile_params_->cookie_settings,
484 &enable_referrers_, 493 &enable_referrers_,
485 cache_stats_)); 494 cache_stats_));
486 495
487 fraudulent_certificate_reporter_.reset( 496 fraudulent_certificate_reporter_.reset(
488 new chrome_browser_net::ChromeFraudulentCertificateReporter( 497 new chrome_browser_net::ChromeFraudulentCertificateReporter(
489 main_request_context_.get())); 498 main_request_context_.get()));
490 499
491 proxy_service_.reset( 500 proxy_service_.reset(
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 } 609 }
601 610
602 void ProfileIOData::set_server_bound_cert_service( 611 void ProfileIOData::set_server_bound_cert_service(
603 net::ServerBoundCertService* server_bound_cert_service) const { 612 net::ServerBoundCertService* server_bound_cert_service) const {
604 server_bound_cert_service_.reset(server_bound_cert_service); 613 server_bound_cert_service_.reset(server_bound_cert_service);
605 } 614 }
606 615
607 void ProfileIOData::DestroyResourceContext() { 616 void ProfileIOData::DestroyResourceContext() {
608 resource_context_.reset(); 617 resource_context_.reset();
609 } 618 }
OLDNEW
« no previous file with comments | « chrome/browser/net/chrome_network_delegate_unittest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698