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

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

Issue 715203004: PlzNavigate: Add a browser test for basic navigations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed issue with cross-site navigation test Created 5 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
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 4363 matching lines...) Expand 10 before | Expand all | Expand 10 after
4374 // (devtools). 4374 // (devtools).
4375 // 4375 //
4376 // TODO(clamy): Apply devtools override. 4376 // TODO(clamy): Apply devtools override.
4377 // TODO(clamy): Make sure that navigation requests are not modified somewhere 4377 // TODO(clamy): Make sure that navigation requests are not modified somewhere
4378 // else in blink. 4378 // else in blink.
4379 willSendRequest(frame_, 0, *request, blink::WebURLResponse()); 4379 willSendRequest(frame_, 0, *request, blink::WebURLResponse());
4380 4380
4381 // TODO(clamy): Same-document navigations should not be sent back to the 4381 // TODO(clamy): Same-document navigations should not be sent back to the
4382 // browser. 4382 // browser.
4383 // TODO(clamy): Data urls should not be sent back to the browser either. 4383 // TODO(clamy): Data urls should not be sent back to the browser either.
4384 Send(new FrameHostMsg_DidStartLoading(routing_id_, true));
4384 Send(new FrameHostMsg_BeginNavigation(routing_id_, 4385 Send(new FrameHostMsg_BeginNavigation(routing_id_,
4385 MakeBeginNavigationParams(request), 4386 MakeBeginNavigationParams(request),
4386 MakeCommonNavigationParams(request))); 4387 MakeCommonNavigationParams(request)));
4387 } 4388 }
4388 4389
4389 GURL RenderFrameImpl::GetLoadingUrl() const { 4390 GURL RenderFrameImpl::GetLoadingUrl() const {
4390 WebDataSource* ds = frame_->dataSource(); 4391 WebDataSource* ds = frame_->dataSource();
4391 if (ds->hasUnreachableURL()) 4392 if (ds->hasUnreachableURL())
4392 return ds->unreachableURL(); 4393 return ds->unreachableURL();
4393 4394
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
4448 4449
4449 #if defined(ENABLE_BROWSER_CDMS) 4450 #if defined(ENABLE_BROWSER_CDMS)
4450 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 4451 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
4451 if (!cdm_manager_) 4452 if (!cdm_manager_)
4452 cdm_manager_ = new RendererCdmManager(this); 4453 cdm_manager_ = new RendererCdmManager(this);
4453 return cdm_manager_; 4454 return cdm_manager_;
4454 } 4455 }
4455 #endif // defined(ENABLE_BROWSER_CDMS) 4456 #endif // defined(ENABLE_BROWSER_CDMS)
4456 4457
4457 } // namespace content 4458 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698