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

Side by Side Diff: chrome/browser/renderer_host/resource_dispatcher_host.cc

Issue 2862041: Remove abonded privacy blacklist implementation. (Closed)
Patch Set: fix unit tests Created 10 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
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 // See http://dev.chromium.org/developers/design-documents/multi-process-resourc e-loading 5 // See http://dev.chromium.org/developers/design-documents/multi-process-resourc e-loading
6 6
7 #include "chrome/browser/renderer_host/resource_dispatcher_host.h" 7 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 10 matching lines...) Expand all
21 #include "chrome/browser/download/download_manager.h" 21 #include "chrome/browser/download/download_manager.h"
22 #include "chrome/browser/download/download_request_manager.h" 22 #include "chrome/browser/download/download_request_manager.h"
23 #include "chrome/browser/download/save_file_manager.h" 23 #include "chrome/browser/download/save_file_manager.h"
24 #include "chrome/browser/extensions/user_script_listener.h" 24 #include "chrome/browser/extensions/user_script_listener.h"
25 #include "chrome/browser/external_protocol_handler.h" 25 #include "chrome/browser/external_protocol_handler.h"
26 #include "chrome/browser/in_process_webkit/webkit_thread.h" 26 #include "chrome/browser/in_process_webkit/webkit_thread.h"
27 #include "chrome/browser/login_prompt.h" 27 #include "chrome/browser/login_prompt.h"
28 #include "chrome/browser/net/chrome_url_request_context.h" 28 #include "chrome/browser/net/chrome_url_request_context.h"
29 #include "chrome/browser/net/url_request_tracking.h" 29 #include "chrome/browser/net/url_request_tracking.h"
30 #include "chrome/browser/plugin_service.h" 30 #include "chrome/browser/plugin_service.h"
31 #include "chrome/browser/privacy_blacklist/blacklist.h"
32 #include "chrome/browser/privacy_blacklist/blacklist_request_info.h"
33 #include "chrome/browser/profile.h" 31 #include "chrome/browser/profile.h"
34 #include "chrome/browser/renderer_host/async_resource_handler.h" 32 #include "chrome/browser/renderer_host/async_resource_handler.h"
35 #include "chrome/browser/renderer_host/buffered_resource_handler.h" 33 #include "chrome/browser/renderer_host/buffered_resource_handler.h"
36 #include "chrome/browser/renderer_host/cross_site_resource_handler.h" 34 #include "chrome/browser/renderer_host/cross_site_resource_handler.h"
37 #include "chrome/browser/renderer_host/download_resource_handler.h" 35 #include "chrome/browser/renderer_host/download_resource_handler.h"
38 #include "chrome/browser/renderer_host/global_request_id.h" 36 #include "chrome/browser/renderer_host/global_request_id.h"
39 #include "chrome/browser/renderer_host/render_view_host.h" 37 #include "chrome/browser/renderer_host/render_view_host.h"
40 #include "chrome/browser/renderer_host/render_view_host_delegate.h" 38 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
41 #include "chrome/browser/renderer_host/render_view_host_notification_task.h" 39 #include "chrome/browser/renderer_host/render_view_host_notification_task.h"
42 #include "chrome/browser/renderer_host/resource_dispatcher_host_request_info.h" 40 #include "chrome/browser/renderer_host/resource_dispatcher_host_request_info.h"
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 extra_info); 472 extra_info);
475 SetRequestInfo(request, extra_info); // Request takes ownership. 473 SetRequestInfo(request, extra_info); // Request takes ownership.
476 chrome_browser_net::SetOriginProcessUniqueIDForRequest( 474 chrome_browser_net::SetOriginProcessUniqueIDForRequest(
477 request_data.origin_child_id, request); 475 request_data.origin_child_id, request);
478 476
479 // Have the appcache associate its extra info with the request. 477 // Have the appcache associate its extra info with the request.
480 appcache::AppCacheInterceptor::SetExtraRequestInfo( 478 appcache::AppCacheInterceptor::SetExtraRequestInfo(
481 request, context ? context->appcache_service() : NULL, child_id, 479 request, context ? context->appcache_service() : NULL, child_id,
482 request_data.appcache_host_id, request_data.resource_type); 480 request_data.appcache_host_id, request_data.resource_type);
483 481
484 // Associate Privacy Blacklist information with the request.
485 if (CommandLine::ForCurrentProcess()->HasSwitch(
486 switches::kEnablePrivacyBlacklists)) {
487 request->SetUserData(&BlacklistRequestInfo::kURLRequestDataKey,
488 new BlacklistRequestInfo(request_data.url, request_data.resource_type,
489 context ? context->GetPrivacyBlacklist() : NULL));
490 }
491
492 BeginRequestInternal(request); 482 BeginRequestInternal(request);
493 } 483 }
494 484
495 void ResourceDispatcherHost::OnDataReceivedACK(int request_id) { 485 void ResourceDispatcherHost::OnDataReceivedACK(int request_id) {
496 DataReceivedACK(receiver_->id(), request_id); 486 DataReceivedACK(receiver_->id(), request_id);
497 } 487 }
498 488
499 void ResourceDispatcherHost::DataReceivedACK(int child_id, 489 void ResourceDispatcherHost::DataReceivedACK(int child_id,
500 int request_id) { 490 int request_id) {
501 PendingRequestList::iterator i = pending_requests_.find( 491 PendingRequestList::iterator i = pending_requests_.find(
(...skipping 1317 matching lines...) Expand 10 before | Expand all | Expand 10 after
1819 // them. 1809 // them.
1820 case ResourceType::IMAGE: 1810 case ResourceType::IMAGE:
1821 return net::LOWEST; 1811 return net::LOWEST;
1822 1812
1823 default: 1813 default:
1824 // When new resource types are added, their priority must be considered. 1814 // When new resource types are added, their priority must be considered.
1825 NOTREACHED(); 1815 NOTREACHED();
1826 return net::LOW; 1816 return net::LOW;
1827 } 1817 }
1828 } 1818 }
OLDNEW
« no previous file with comments | « chrome/browser/renderer_host/resource_dispatcher_host.h ('k') | chrome/browser/renderer_host/resource_message_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698