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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 395093002: Remove RenderFrameImpl::willRequestAfterPreconnect (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 2311 matching lines...) Expand 10 before | Expand all | Expand 10 after
2322 params.selection_end = gfx::Point(end_rect.right(), end_rect.bottom()); 2322 params.selection_end = gfx::Point(end_rect.right(), end_rect.bottom());
2323 #endif 2323 #endif
2324 2324
2325 Send(new FrameHostMsg_ContextMenu(routing_id_, params)); 2325 Send(new FrameHostMsg_ContextMenu(routing_id_, params));
2326 } 2326 }
2327 2327
2328 void RenderFrameImpl::clearContextMenu() { 2328 void RenderFrameImpl::clearContextMenu() {
2329 context_menu_node_.reset(); 2329 context_menu_node_.reset();
2330 } 2330 }
2331 2331
2332 void RenderFrameImpl::willRequestAfterPreconnect(
2333 blink::WebLocalFrame* frame,
2334 blink::WebURLRequest& request) {
2335 DCHECK(!frame_ || frame_ == frame);
2336 // FIXME(kohei): This will never be set.
2337 WebString custom_user_agent;
2338
2339 DCHECK(!request.extraData());
2340
2341 bool was_after_preconnect_request = true;
2342 // The args after |was_after_preconnect_request| are not used, and set to
2343 // correct values at |willSendRequest|.
2344 RequestExtraData* extra_data = new RequestExtraData();
2345 extra_data->set_custom_user_agent(custom_user_agent);
2346 extra_data->set_was_after_preconnect_request(was_after_preconnect_request);
2347 request.setExtraData(extra_data);
2348 }
2349
2350 void RenderFrameImpl::willSendRequest( 2332 void RenderFrameImpl::willSendRequest(
2351 blink::WebLocalFrame* frame, 2333 blink::WebLocalFrame* frame,
2352 unsigned identifier, 2334 unsigned identifier,
2353 blink::WebURLRequest& request, 2335 blink::WebURLRequest& request,
2354 const blink::WebURLResponse& redirect_response) { 2336 const blink::WebURLResponse& redirect_response) {
2355 DCHECK(!frame_ || frame_ == frame); 2337 DCHECK(!frame_ || frame_ == frame);
2356 // The request my be empty during tests. 2338 // The request my be empty during tests.
2357 if (request.url().isEmpty()) 2339 if (request.url().isEmpty())
2358 return; 2340 return;
2359 2341
(...skipping 1218 matching lines...) Expand 10 before | Expand all | Expand 10 after
3578 3560
3579 #if defined(ENABLE_BROWSER_CDMS) 3561 #if defined(ENABLE_BROWSER_CDMS)
3580 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 3562 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
3581 if (!cdm_manager_) 3563 if (!cdm_manager_)
3582 cdm_manager_ = new RendererCdmManager(this); 3564 cdm_manager_ = new RendererCdmManager(this);
3583 return cdm_manager_; 3565 return cdm_manager_;
3584 } 3566 }
3585 #endif // defined(ENABLE_BROWSER_CDMS) 3567 #endif // defined(ENABLE_BROWSER_CDMS)
3586 3568
3587 } // namespace content 3569 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698