| 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 723 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 734 IPC_END_MESSAGE_MAP() | 734 IPC_END_MESSAGE_MAP() |
| 735 | 735 |
| 736 return handled; | 736 return handled; |
| 737 } | 737 } |
| 738 | 738 |
| 739 void RenderFrameImpl::OnNavigate(const FrameMsg_Navigate_Params& params) { | 739 void RenderFrameImpl::OnNavigate(const FrameMsg_Navigate_Params& params) { |
| 740 MaybeHandleDebugURL(params.url); | 740 MaybeHandleDebugURL(params.url); |
| 741 if (!render_view_->webview()) | 741 if (!render_view_->webview()) |
| 742 return; | 742 return; |
| 743 | 743 |
| 744 render_view_->OnNavigate(params); | 744 FOR_EACH_OBSERVER( |
| 745 RenderViewObserver, render_view_->observers_, Navigate(params.url)); |
| 745 | 746 |
| 746 bool is_reload = RenderViewImpl::IsReload(params); | 747 bool is_reload = RenderViewImpl::IsReload(params); |
| 747 WebURLRequest::CachePolicy cache_policy = | 748 WebURLRequest::CachePolicy cache_policy = |
| 748 WebURLRequest::UseProtocolCachePolicy; | 749 WebURLRequest::UseProtocolCachePolicy; |
| 749 | 750 |
| 750 // If this is a stale back/forward (due to a recent navigation the browser | 751 // If this is a stale back/forward (due to a recent navigation the browser |
| 751 // didn't know about), ignore it. | 752 // didn't know about), ignore it. |
| 752 if (render_view_->IsBackForwardToStaleEntry(params, is_reload)) | 753 if (render_view_->IsBackForwardToStaleEntry(params, is_reload)) |
| 753 return; | 754 return; |
| 754 | 755 |
| (...skipping 2808 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3563 | 3564 |
| 3564 #if defined(ENABLE_BROWSER_CDMS) | 3565 #if defined(ENABLE_BROWSER_CDMS) |
| 3565 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 3566 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
| 3566 if (!cdm_manager_) | 3567 if (!cdm_manager_) |
| 3567 cdm_manager_ = new RendererCdmManager(this); | 3568 cdm_manager_ = new RendererCdmManager(this); |
| 3568 return cdm_manager_; | 3569 return cdm_manager_; |
| 3569 } | 3570 } |
| 3570 #endif // defined(ENABLE_BROWSER_CDMS) | 3571 #endif // defined(ENABLE_BROWSER_CDMS) |
| 3571 | 3572 |
| 3572 } // namespace content | 3573 } // namespace content |
| OLD | NEW |