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

Side by Side Diff: chrome/browser/prerender/prerender_resource_throttle.cc

Issue 370833002: Move resource_type.* from webkit/ to content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chromeos fix Created 6 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/prerender/prerender_resource_throttle.h" 5 #include "chrome/browser/prerender/prerender_resource_throttle.h"
6 6
7 #include "chrome/browser/prerender/prerender_final_status.h" 7 #include "chrome/browser/prerender/prerender_final_status.h"
8 #include "chrome/browser/prerender/prerender_manager.h" 8 #include "chrome/browser/prerender/prerender_manager.h"
9 #include "chrome/browser/prerender/prerender_util.h" 9 #include "chrome/browser/prerender/prerender_util.h"
10 #include "content/public/browser/browser_thread.h" 10 #include "content/public/browser/browser_thread.h"
11 #include "content/public/browser/render_frame_host.h" 11 #include "content/public/browser/render_frame_host.h"
12 #include "content/public/browser/resource_controller.h" 12 #include "content/public/browser/resource_controller.h"
13 #include "content/public/browser/resource_request_info.h" 13 #include "content/public/browser/resource_request_info.h"
14 #include "content/public/browser/web_contents.h" 14 #include "content/public/browser/web_contents.h"
15 #include "net/url_request/url_request.h" 15 #include "net/url_request/url_request.h"
16 16
17 using content::ResourceType;
18
17 namespace prerender { 19 namespace prerender {
18 20
19 namespace { 21 namespace {
20 static const char kFollowOnlyWhenPrerenderShown[] = 22 static const char kFollowOnlyWhenPrerenderShown[] =
21 "follow-only-when-prerender-shown"; 23 "follow-only-when-prerender-shown";
22 24
23 PrerenderContents* g_prerender_contents_for_testing; 25 PrerenderContents* g_prerender_contents_for_testing;
24 } 26 }
25 27
26 void PrerenderResourceThrottle::OverridePrerenderContentsForTesting( 28 void PrerenderResourceThrottle::OverridePrerenderContentsForTesting(
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 if (g_prerender_contents_for_testing) 158 if (g_prerender_contents_for_testing)
157 return g_prerender_contents_for_testing; 159 return g_prerender_contents_for_testing;
158 content::RenderFrameHost* rfh = content::RenderFrameHost::FromID( 160 content::RenderFrameHost* rfh = content::RenderFrameHost::FromID(
159 render_process_id, render_frame_id); 161 render_process_id, render_frame_id);
160 content::WebContents* web_contents = 162 content::WebContents* web_contents =
161 content::WebContents::FromRenderFrameHost(rfh); 163 content::WebContents::FromRenderFrameHost(rfh);
162 return PrerenderContents::FromWebContents(web_contents); 164 return PrerenderContents::FromWebContents(web_contents);
163 } 165 }
164 166
165 } // namespace prerender 167 } // namespace prerender
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698