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

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

Issue 1081013002: Revert of Ensuring interception of stream get determined by plugin path before checking mime type. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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
« no previous file with comments | « no previous file | chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc » ('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 #ifndef CHROME_BROWSER_RENDERER_HOST_CHROME_RESOURCE_DISPATCHER_HOST_DELEGATE_H_ 5 #ifndef CHROME_BROWSER_RENDERER_HOST_CHROME_RESOURCE_DISPATCHER_HOST_DELEGATE_H_
6 #define CHROME_BROWSER_RENDERER_HOST_CHROME_RESOURCE_DISPATCHER_HOST_DELEGATE_H_ 6 #define CHROME_BROWSER_RENDERER_HOST_CHROME_RESOURCE_DISPATCHER_HOST_DELEGATE_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 10
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 ScopedVector<content::ResourceThrottle>* throttles) override; 51 ScopedVector<content::ResourceThrottle>* throttles) override;
52 content::ResourceDispatcherHostLoginDelegate* CreateLoginDelegate( 52 content::ResourceDispatcherHostLoginDelegate* CreateLoginDelegate(
53 net::AuthChallengeInfo* auth_info, 53 net::AuthChallengeInfo* auth_info,
54 net::URLRequest* request) override; 54 net::URLRequest* request) override;
55 bool HandleExternalProtocol(const GURL& url, 55 bool HandleExternalProtocol(const GURL& url,
56 int child_id, 56 int child_id,
57 int route_id) override; 57 int route_id) override;
58 bool ShouldForceDownloadResource(const GURL& url, 58 bool ShouldForceDownloadResource(const GURL& url,
59 const std::string& mime_type) override; 59 const std::string& mime_type) override;
60 bool ShouldInterceptResourceAsStream(net::URLRequest* request, 60 bool ShouldInterceptResourceAsStream(net::URLRequest* request,
61 const base::FilePath& plugin_path,
62 const std::string& mime_type, 61 const std::string& mime_type,
63 GURL* origin, 62 GURL* origin,
64 std::string* payload) override; 63 std::string* payload) override;
65 void OnStreamCreated(net::URLRequest* request, 64 void OnStreamCreated(net::URLRequest* request,
66 scoped_ptr<content::StreamInfo> stream) override; 65 scoped_ptr<content::StreamInfo> stream) override;
67 void OnResponseStarted(net::URLRequest* request, 66 void OnResponseStarted(net::URLRequest* request,
68 content::ResourceContext* resource_context, 67 content::ResourceContext* resource_context,
69 content::ResourceResponse* response, 68 content::ResourceResponse* response,
70 IPC::Sender* sender) override; 69 IPC::Sender* sender) override;
71 void OnRequestRedirected(const GURL& redirect_url, 70 void OnRequestRedirected(const GURL& redirect_url,
(...skipping 25 matching lines...) Expand all
97 scoped_refptr<SafeBrowsingService> safe_browsing_; 96 scoped_refptr<SafeBrowsingService> safe_browsing_;
98 #if defined(ENABLE_EXTENSIONS) 97 #if defined(ENABLE_EXTENSIONS)
99 scoped_refptr<extensions::UserScriptListener> user_script_listener_; 98 scoped_refptr<extensions::UserScriptListener> user_script_listener_;
100 std::map<net::URLRequest*, StreamTargetInfo> stream_target_info_; 99 std::map<net::URLRequest*, StreamTargetInfo> stream_target_info_;
101 #endif 100 #endif
102 101
103 DISALLOW_COPY_AND_ASSIGN(ChromeResourceDispatcherHostDelegate); 102 DISALLOW_COPY_AND_ASSIGN(ChromeResourceDispatcherHostDelegate);
104 }; 103 };
105 104
106 #endif // CHROME_BROWSER_RENDERER_HOST_CHROME_RESOURCE_DISPATCHER_HOST_DELEGATE _H_ 105 #endif // CHROME_BROWSER_RENDERER_HOST_CHROME_RESOURCE_DISPATCHER_HOST_DELEGATE _H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698