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

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

Issue 2241673002: Make UnsafeResource hold a WebContents getter instead of RenderFrame ids (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: android Created 4 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
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_SAFE_BROWSING_RESOURCE_THROTTLE_H_ 5 #ifndef CHROME_BROWSER_RENDERER_HOST_SAFE_BROWSING_RESOURCE_THROTTLE_H_
6 #define CHROME_BROWSER_RENDERER_HOST_SAFE_BROWSING_RESOURCE_THROTTLE_H_ 6 #define CHROME_BROWSER_RENDERER_HOST_SAFE_BROWSING_RESOURCE_THROTTLE_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 124
125 // Callback for when the safe browsing check (which was initiated by 125 // Callback for when the safe browsing check (which was initiated by
126 // StartCheckingUrl()) has taken longer than kCheckUrlTimeoutMs. 126 // StartCheckingUrl()) has taken longer than kCheckUrlTimeoutMs.
127 void OnCheckUrlTimeout(); 127 void OnCheckUrlTimeout();
128 128
129 // Starts displaying the safe browsing interstitial page if it's not 129 // Starts displaying the safe browsing interstitial page if it's not
130 // prerendering. Called on the UI thread. 130 // prerendering. Called on the UI thread.
131 static void StartDisplayingBlockingPage( 131 static void StartDisplayingBlockingPage(
132 const base::WeakPtr<SafeBrowsingResourceThrottle>& throttle, 132 const base::WeakPtr<SafeBrowsingResourceThrottle>& throttle,
133 scoped_refptr<safe_browsing::SafeBrowsingUIManager> ui_manager, 133 scoped_refptr<safe_browsing::SafeBrowsingUIManager> ui_manager,
134 const safe_browsing::SafeBrowsingUIManager::UnsafeResource& resource); 134 const safe_browsing::SafeBrowsingUIManager::UnsafeResource& resource,
135 int child_id,
136 int render_frame_id);
135 137
136 // Called on the IO thread if the request turned out to be for a prerendered 138 // Called on the IO thread if the request turned out to be for a prerendered
137 // page. 139 // page.
138 void Cancel(); 140 void Cancel();
139 141
140 // Resumes the request, by continuing the deferred action (either starting the 142 // Resumes the request, by continuing the deferred action (either starting the
141 // request, or following a redirect). 143 // request, or following a redirect).
142 void ResumeRequest(); 144 void ResumeRequest();
143 145
144 // For marking network events. |name| and |value| can be null. 146 // For marking network events. |name| and |value| can be null.
(...skipping 28 matching lines...) Expand all
173 175
174 scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager> database_manager_; 176 scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager> database_manager_;
175 scoped_refptr<safe_browsing::SafeBrowsingUIManager> ui_manager_; 177 scoped_refptr<safe_browsing::SafeBrowsingUIManager> ui_manager_;
176 const net::URLRequest* request_; 178 const net::URLRequest* request_;
177 const content::ResourceType resource_type_; 179 const content::ResourceType resource_type_;
178 net::BoundNetLog bound_net_log_; 180 net::BoundNetLog bound_net_log_;
179 181
180 DISALLOW_COPY_AND_ASSIGN(SafeBrowsingResourceThrottle); 182 DISALLOW_COPY_AND_ASSIGN(SafeBrowsingResourceThrottle);
181 }; 183 };
182 #endif // CHROME_BROWSER_RENDERER_HOST_SAFE_BROWSING_RESOURCE_THROTTLE_H_ 184 #endif // CHROME_BROWSER_RENDERER_HOST_SAFE_BROWSING_RESOURCE_THROTTLE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698