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

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

Issue 124383008: Remove is_prerender() from ChromeURLRequestUserData since it's not used anymore. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 years, 11 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) 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 #include "chrome/browser/renderer_host/safe_browsing_resource_throttle.h" 5 #include "chrome/browser/renderer_host/safe_browsing_resource_throttle.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/prerender/prerender_contents.h" 9 #include "chrome/browser/prerender/prerender_contents.h"
10 #include "chrome/browser/renderer_host/chrome_url_request_user_data.h"
11 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 10 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
12 #include "content/public/browser/browser_thread.h" 11 #include "content/public/browser/browser_thread.h"
13 #include "content/public/browser/render_view_host.h" 12 #include "content/public/browser/render_view_host.h"
14 #include "content/public/browser/resource_controller.h" 13 #include "content/public/browser/resource_controller.h"
15 #include "content/public/browser/resource_request_info.h" 14 #include "content/public/browser/resource_request_info.h"
16 #include "content/public/browser/web_contents.h" 15 #include "content/public/browser/web_contents.h"
17 #include "net/base/load_flags.h" 16 #include "net/base/load_flags.h"
18 #include "net/url_request/url_request.h" 17 #include "net/url_request/url_request.h"
19 18
20 // Maximum time in milliseconds to wait for the safe browsing service to 19 // Maximum time in milliseconds to wait for the safe browsing service to
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 OnCheckBrowseUrlResult(url_being_checked_, SB_THREAT_TYPE_SAFE); 210 OnCheckBrowseUrlResult(url_being_checked_, SB_THREAT_TYPE_SAFE);
212 } 211 }
213 212
214 void SafeBrowsingResourceThrottle::ResumeRequest() { 213 void SafeBrowsingResourceThrottle::ResumeRequest() {
215 CHECK(state_ == STATE_NONE); 214 CHECK(state_ == STATE_NONE);
216 CHECK(defer_state_ != DEFERRED_NONE); 215 CHECK(defer_state_ != DEFERRED_NONE);
217 216
218 defer_state_ = DEFERRED_NONE; 217 defer_state_ = DEFERRED_NONE;
219 controller()->Resume(); 218 controller()->Resume();
220 } 219 }
OLDNEW
« no previous file with comments | « chrome/browser/renderer_host/chrome_url_request_user_data.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698