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

Side by Side Diff: content/browser/loader/resource_dispatcher_host_impl.cc

Issue 525513003: Cleanup: Put more plugin code behind the ENABLE_PLUGINS ifdef. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 3 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 // 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 "content/browser/loader/resource_dispatcher_host_impl.h" 7 #include "content/browser/loader/resource_dispatcher_host_impl.h"
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <set> 10 #include <set>
(...skipping 26 matching lines...) Expand all
37 #include "content/browser/loader/cross_site_resource_handler.h" 37 #include "content/browser/loader/cross_site_resource_handler.h"
38 #include "content/browser/loader/detachable_resource_handler.h" 38 #include "content/browser/loader/detachable_resource_handler.h"
39 #include "content/browser/loader/power_save_block_resource_throttle.h" 39 #include "content/browser/loader/power_save_block_resource_throttle.h"
40 #include "content/browser/loader/redirect_to_file_resource_handler.h" 40 #include "content/browser/loader/redirect_to_file_resource_handler.h"
41 #include "content/browser/loader/resource_message_filter.h" 41 #include "content/browser/loader/resource_message_filter.h"
42 #include "content/browser/loader/resource_request_info_impl.h" 42 #include "content/browser/loader/resource_request_info_impl.h"
43 #include "content/browser/loader/stream_resource_handler.h" 43 #include "content/browser/loader/stream_resource_handler.h"
44 #include "content/browser/loader/sync_resource_handler.h" 44 #include "content/browser/loader/sync_resource_handler.h"
45 #include "content/browser/loader/throttling_resource_handler.h" 45 #include "content/browser/loader/throttling_resource_handler.h"
46 #include "content/browser/loader/upload_data_stream_builder.h" 46 #include "content/browser/loader/upload_data_stream_builder.h"
47 #include "content/browser/plugin_service_impl.h"
48 #include "content/browser/renderer_host/render_view_host_delegate.h" 47 #include "content/browser/renderer_host/render_view_host_delegate.h"
49 #include "content/browser/renderer_host/render_view_host_impl.h" 48 #include "content/browser/renderer_host/render_view_host_impl.h"
50 #include "content/browser/resource_context_impl.h" 49 #include "content/browser/resource_context_impl.h"
51 #include "content/browser/service_worker/service_worker_request_handler.h" 50 #include "content/browser/service_worker/service_worker_request_handler.h"
52 #include "content/browser/streams/stream.h" 51 #include "content/browser/streams/stream.h"
53 #include "content/browser/streams/stream_context.h" 52 #include "content/browser/streams/stream_context.h"
54 #include "content/browser/streams/stream_registry.h" 53 #include "content/browser/streams/stream_registry.h"
55 #include "content/browser/web_contents/web_contents_impl.h" 54 #include "content/browser/web_contents/web_contents_impl.h"
56 #include "content/common/appcache_interfaces.h" 55 #include "content/common/appcache_interfaces.h"
57 #include "content/common/resource_messages.h" 56 #include "content/common/resource_messages.h"
(...skipping 30 matching lines...) Expand all
88 #include "net/url_request/url_request_job_factory.h" 87 #include "net/url_request/url_request_job_factory.h"
89 #include "url/url_constants.h" 88 #include "url/url_constants.h"
90 #include "webkit/common/blob/blob_data.h" 89 #include "webkit/common/blob/blob_data.h"
91 #include "webkit/browser/blob/blob_data_handle.h" 90 #include "webkit/browser/blob/blob_data_handle.h"
92 #include "webkit/browser/blob/blob_storage_context.h" 91 #include "webkit/browser/blob/blob_storage_context.h"
93 #include "webkit/browser/blob/blob_url_request_job_factory.h" 92 #include "webkit/browser/blob/blob_url_request_job_factory.h"
94 #include "webkit/browser/fileapi/file_permission_policy.h" 93 #include "webkit/browser/fileapi/file_permission_policy.h"
95 #include "webkit/browser/fileapi/file_system_context.h" 94 #include "webkit/browser/fileapi/file_system_context.h"
96 #include "webkit/common/blob/shareable_file_reference.h" 95 #include "webkit/common/blob/shareable_file_reference.h"
97 96
97 #if defined(ENABLE_PLUGINS)
98 #include "content/browser/plugin_service_impl.h"
99 #endif
100
98 using base::Time; 101 using base::Time;
99 using base::TimeDelta; 102 using base::TimeDelta;
100 using base::TimeTicks; 103 using base::TimeTicks;
101 using storage::ShareableFileReference; 104 using storage::ShareableFileReference;
102 105
103 // ---------------------------------------------------------------------------- 106 // ----------------------------------------------------------------------------
104 107
105 namespace content { 108 namespace content {
106 109
107 namespace { 110 namespace {
(...skipping 1930 matching lines...) Expand 10 before | Expand all | Expand 10 after
2038 2041
2039 // Add a flag to selectively bypass the data reduction proxy if the resource 2042 // Add a flag to selectively bypass the data reduction proxy if the resource
2040 // type is not an image. 2043 // type is not an image.
2041 if (request_data.resource_type != RESOURCE_TYPE_IMAGE) 2044 if (request_data.resource_type != RESOURCE_TYPE_IMAGE)
2042 load_flags |= net::LOAD_BYPASS_DATA_REDUCTION_PROXY; 2045 load_flags |= net::LOAD_BYPASS_DATA_REDUCTION_PROXY;
2043 2046
2044 return load_flags; 2047 return load_flags;
2045 } 2048 }
2046 2049
2047 } // namespace content 2050 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/loader/buffered_resource_handler.cc ('k') | content/browser/plugin_service_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698