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 771 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
782 IPC_MESSAGE_HANDLER(FrameMsg_SetupTransitionView, OnSetupTransitionView) | 782 IPC_MESSAGE_HANDLER(FrameMsg_SetupTransitionView, OnSetupTransitionView) |
783 IPC_MESSAGE_HANDLER(FrameMsg_BeginExitTransition, OnBeginExitTransition) | 783 IPC_MESSAGE_HANDLER(FrameMsg_BeginExitTransition, OnBeginExitTransition) |
784 IPC_MESSAGE_HANDLER(FrameMsg_Reload, OnReload) | 784 IPC_MESSAGE_HANDLER(FrameMsg_Reload, OnReload) |
785 IPC_MESSAGE_HANDLER(FrameMsg_TextSurroundingSelectionRequest, | 785 IPC_MESSAGE_HANDLER(FrameMsg_TextSurroundingSelectionRequest, |
786 OnTextSurroundingSelectionRequest) | 786 OnTextSurroundingSelectionRequest) |
787 IPC_MESSAGE_HANDLER(FrameMsg_AddStyleSheetByURL, | 787 IPC_MESSAGE_HANDLER(FrameMsg_AddStyleSheetByURL, |
788 OnAddStyleSheetByURL) | 788 OnAddStyleSheetByURL) |
789 IPC_MESSAGE_HANDLER(FrameMsg_SetAccessibilityMode, | 789 IPC_MESSAGE_HANDLER(FrameMsg_SetAccessibilityMode, |
790 OnSetAccessibilityMode) | 790 OnSetAccessibilityMode) |
791 IPC_MESSAGE_HANDLER(FrameMsg_DisownOpener, OnDisownOpener) | 791 IPC_MESSAGE_HANDLER(FrameMsg_DisownOpener, OnDisownOpener) |
| 792 IPC_MESSAGE_HANDLER(FrameMsg_CommitNavigation, OnCommitNavigation) |
792 #if defined(OS_ANDROID) | 793 #if defined(OS_ANDROID) |
793 IPC_MESSAGE_HANDLER(FrameMsg_SelectPopupMenuItems, OnSelectPopupMenuItems) | 794 IPC_MESSAGE_HANDLER(FrameMsg_SelectPopupMenuItems, OnSelectPopupMenuItems) |
794 #elif defined(OS_MACOSX) | 795 #elif defined(OS_MACOSX) |
795 IPC_MESSAGE_HANDLER(FrameMsg_SelectPopupMenuItem, OnSelectPopupMenuItem) | 796 IPC_MESSAGE_HANDLER(FrameMsg_SelectPopupMenuItem, OnSelectPopupMenuItem) |
796 IPC_MESSAGE_HANDLER(InputMsg_CopyToFindPboard, OnCopyToFindPboard) | 797 IPC_MESSAGE_HANDLER(InputMsg_CopyToFindPboard, OnCopyToFindPboard) |
797 #endif | 798 #endif |
798 IPC_END_MESSAGE_MAP() | 799 IPC_END_MESSAGE_MAP() |
799 | 800 |
800 return handled; | 801 return handled; |
801 } | 802 } |
(...skipping 493 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1295 void RenderFrameImpl::OnDisownOpener() { | 1296 void RenderFrameImpl::OnDisownOpener() { |
1296 // TODO(creis): We should only see this for main frames for now. To support | 1297 // TODO(creis): We should only see this for main frames for now. To support |
1297 // disowning the opener on subframes, we will need to move WebContentsImpl's | 1298 // disowning the opener on subframes, we will need to move WebContentsImpl's |
1298 // opener_ to FrameTreeNode. | 1299 // opener_ to FrameTreeNode. |
1299 CHECK(!frame_->parent()); | 1300 CHECK(!frame_->parent()); |
1300 | 1301 |
1301 if (frame_->opener()) | 1302 if (frame_->opener()) |
1302 frame_->setOpener(NULL); | 1303 frame_->setOpener(NULL); |
1303 } | 1304 } |
1304 | 1305 |
| 1306 // PlzNavigate |
| 1307 void RenderFrameImpl::OnCommitNavigation( |
| 1308 const FrameMsg_CommitNavigation_Params& params) { |
| 1309 NOTREACHED(); |
| 1310 } |
| 1311 |
1305 #if defined(OS_ANDROID) | 1312 #if defined(OS_ANDROID) |
1306 void RenderFrameImpl::OnSelectPopupMenuItems( | 1313 void RenderFrameImpl::OnSelectPopupMenuItems( |
1307 bool canceled, | 1314 bool canceled, |
1308 const std::vector<int>& selected_indices) { | 1315 const std::vector<int>& selected_indices) { |
1309 // It is possible to receive more than one of these calls if the user presses | 1316 // It is possible to receive more than one of these calls if the user presses |
1310 // a select faster than it takes for the show-select-popup IPC message to make | 1317 // a select faster than it takes for the show-select-popup IPC message to make |
1311 // it to the browser UI thread. Ignore the extra-messages. | 1318 // it to the browser UI thread. Ignore the extra-messages. |
1312 // TODO(jcivelli): http:/b/5793321 Implement a better fix, as detailed in bug. | 1319 // TODO(jcivelli): http:/b/5793321 Implement a better fix, as detailed in bug. |
1313 if (!external_popup_menu_) | 1320 if (!external_popup_menu_) |
1314 return; | 1321 return; |
(...skipping 2534 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3849 | 3856 |
3850 #if defined(ENABLE_BROWSER_CDMS) | 3857 #if defined(ENABLE_BROWSER_CDMS) |
3851 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 3858 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
3852 if (!cdm_manager_) | 3859 if (!cdm_manager_) |
3853 cdm_manager_ = new RendererCdmManager(this); | 3860 cdm_manager_ = new RendererCdmManager(this); |
3854 return cdm_manager_; | 3861 return cdm_manager_; |
3855 } | 3862 } |
3856 #endif // defined(ENABLE_BROWSER_CDMS) | 3863 #endif // defined(ENABLE_BROWSER_CDMS) |
3857 | 3864 |
3858 } // namespace content | 3865 } // namespace content |
OLD | NEW |