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

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

Issue 7282054: Remove more unnecessary ChromeURLRequestContext members. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix copyright and chormeos tests. Created 9 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/renderer_host/chrome_resource_dispatcher_host_delegate. h" 5 #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate. h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/content_settings/host_content_settings_map.h" 9 #include "chrome/browser/content_settings/host_content_settings_map.h"
10 #include "chrome/browser/external_protocol/external_protocol_handler.h" 10 #include "chrome/browser/external_protocol/external_protocol_handler.h"
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 if (io_data->safe_browsing_enabled()->GetValue()) { 127 if (io_data->safe_browsing_enabled()->GetValue()) {
128 handler = CreateSafeBrowsingResourceHandler( 128 handler = CreateSafeBrowsingResourceHandler(
129 handler, child_id, route_id, is_subresource); 129 handler, child_id, route_id, is_subresource);
130 } 130 }
131 #endif 131 #endif
132 132
133 #if defined(OS_CHROMEOS) 133 #if defined(OS_CHROMEOS)
134 // We check offline first, then check safe browsing so that we still can block 134 // We check offline first, then check safe browsing so that we still can block
135 // unsafe site after we remove offline page. 135 // unsafe site after we remove offline page.
136 handler = new OfflineResourceHandler( 136 handler = new OfflineResourceHandler(
137 handler, child_id, route_id, resource_dispatcher_host_, request); 137 handler, child_id, route_id, resource_dispatcher_host_, request,
138 resource_context.appcache_service());
138 #endif 139 #endif
139 return handler; 140 return handler;
140 } 141 }
141 142
142 ResourceHandler* ChromeResourceDispatcherHostDelegate::DownloadStarting( 143 ResourceHandler* ChromeResourceDispatcherHostDelegate::DownloadStarting(
143 ResourceHandler* handler, 144 ResourceHandler* handler,
144 const content::ResourceContext& resource_context, 145 const content::ResourceContext& resource_context,
145 int child_id, 146 int child_id,
146 int route_id) { 147 int route_id) {
147 #if defined(ENABLE_SAFE_BROWSING) 148 #if defined(ENABLE_SAFE_BROWSING)
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 info->route_id(), request->url(), 258 info->route_id(), request->url(),
258 map->GetContentSettings(request->url(), request->url()))); 259 map->GetContentSettings(request->url(), request->url())));
259 } 260 }
260 261
261 void ChromeResourceDispatcherHostDelegate::OnRequestRedirected( 262 void ChromeResourceDispatcherHostDelegate::OnRequestRedirected(
262 net::URLRequest* request, 263 net::URLRequest* request,
263 ResourceResponse* response, 264 ResourceResponse* response,
264 ResourceMessageFilter* filter) { 265 ResourceMessageFilter* filter) {
265 LoadTimingObserver::PopulateTimingInfo(request, response); 266 LoadTimingObserver::PopulateTimingInfo(request, response);
266 } 267 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698