| OLD | NEW |
| 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 4375 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4386 // (devtools). | 4386 // (devtools). |
| 4387 // | 4387 // |
| 4388 // TODO(clamy): Apply devtools override. | 4388 // TODO(clamy): Apply devtools override. |
| 4389 // TODO(clamy): Make sure that navigation requests are not modified somewhere | 4389 // TODO(clamy): Make sure that navigation requests are not modified somewhere |
| 4390 // else in blink. | 4390 // else in blink. |
| 4391 willSendRequest(frame_, 0, *request, blink::WebURLResponse()); | 4391 willSendRequest(frame_, 0, *request, blink::WebURLResponse()); |
| 4392 | 4392 |
| 4393 // TODO(clamy): Same-document navigations should not be sent back to the | 4393 // TODO(clamy): Same-document navigations should not be sent back to the |
| 4394 // browser. | 4394 // browser. |
| 4395 // TODO(clamy): Data urls should not be sent back to the browser either. | 4395 // TODO(clamy): Data urls should not be sent back to the browser either. |
| 4396 Send(new FrameHostMsg_DidStartLoading(routing_id_, true)); |
| 4396 Send(new FrameHostMsg_BeginNavigation(routing_id_, | 4397 Send(new FrameHostMsg_BeginNavigation(routing_id_, |
| 4397 MakeBeginNavigationParams(request), | 4398 MakeBeginNavigationParams(request), |
| 4398 MakeCommonNavigationParams(request))); | 4399 MakeCommonNavigationParams(request))); |
| 4399 } | 4400 } |
| 4400 | 4401 |
| 4401 GURL RenderFrameImpl::GetLoadingUrl() const { | 4402 GURL RenderFrameImpl::GetLoadingUrl() const { |
| 4402 WebDataSource* ds = frame_->dataSource(); | 4403 WebDataSource* ds = frame_->dataSource(); |
| 4403 if (ds->hasUnreachableURL()) | 4404 if (ds->hasUnreachableURL()) |
| 4404 return ds->unreachableURL(); | 4405 return ds->unreachableURL(); |
| 4405 | 4406 |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4460 | 4461 |
| 4461 #if defined(ENABLE_BROWSER_CDMS) | 4462 #if defined(ENABLE_BROWSER_CDMS) |
| 4462 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 4463 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
| 4463 if (!cdm_manager_) | 4464 if (!cdm_manager_) |
| 4464 cdm_manager_ = new RendererCdmManager(this); | 4465 cdm_manager_ = new RendererCdmManager(this); |
| 4465 return cdm_manager_; | 4466 return cdm_manager_; |
| 4466 } | 4467 } |
| 4467 #endif // defined(ENABLE_BROWSER_CDMS) | 4468 #endif // defined(ENABLE_BROWSER_CDMS) |
| 4468 | 4469 |
| 4469 } // namespace content | 4470 } // namespace content |
| OLD | NEW |