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 774 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
785 IPC_MESSAGE_HANDLER(FrameMsg_SetupTransitionView, OnSetupTransitionView) | 785 IPC_MESSAGE_HANDLER(FrameMsg_SetupTransitionView, OnSetupTransitionView) |
786 IPC_MESSAGE_HANDLER(FrameMsg_BeginExitTransition, OnBeginExitTransition) | 786 IPC_MESSAGE_HANDLER(FrameMsg_BeginExitTransition, OnBeginExitTransition) |
787 IPC_MESSAGE_HANDLER(FrameMsg_Reload, OnReload) | 787 IPC_MESSAGE_HANDLER(FrameMsg_Reload, OnReload) |
788 IPC_MESSAGE_HANDLER(FrameMsg_TextSurroundingSelectionRequest, | 788 IPC_MESSAGE_HANDLER(FrameMsg_TextSurroundingSelectionRequest, |
789 OnTextSurroundingSelectionRequest) | 789 OnTextSurroundingSelectionRequest) |
790 IPC_MESSAGE_HANDLER(FrameMsg_AddStyleSheetByURL, | 790 IPC_MESSAGE_HANDLER(FrameMsg_AddStyleSheetByURL, |
791 OnAddStyleSheetByURL) | 791 OnAddStyleSheetByURL) |
792 IPC_MESSAGE_HANDLER(FrameMsg_SetAccessibilityMode, | 792 IPC_MESSAGE_HANDLER(FrameMsg_SetAccessibilityMode, |
793 OnSetAccessibilityMode) | 793 OnSetAccessibilityMode) |
794 IPC_MESSAGE_HANDLER(FrameMsg_DisownOpener, OnDisownOpener) | 794 IPC_MESSAGE_HANDLER(FrameMsg_DisownOpener, OnDisownOpener) |
| 795 IPC_MESSAGE_HANDLER(FrameMsg_CommitNavigation, OnCommitNavigation) |
795 #if defined(OS_ANDROID) | 796 #if defined(OS_ANDROID) |
796 IPC_MESSAGE_HANDLER(FrameMsg_SelectPopupMenuItems, OnSelectPopupMenuItems) | 797 IPC_MESSAGE_HANDLER(FrameMsg_SelectPopupMenuItems, OnSelectPopupMenuItems) |
797 #elif defined(OS_MACOSX) | 798 #elif defined(OS_MACOSX) |
798 IPC_MESSAGE_HANDLER(FrameMsg_SelectPopupMenuItem, OnSelectPopupMenuItem) | 799 IPC_MESSAGE_HANDLER(FrameMsg_SelectPopupMenuItem, OnSelectPopupMenuItem) |
799 IPC_MESSAGE_HANDLER(InputMsg_CopyToFindPboard, OnCopyToFindPboard) | 800 IPC_MESSAGE_HANDLER(InputMsg_CopyToFindPboard, OnCopyToFindPboard) |
800 #endif | 801 #endif |
801 IPC_END_MESSAGE_MAP() | 802 IPC_END_MESSAGE_MAP() |
802 | 803 |
803 return handled; | 804 return handled; |
804 } | 805 } |
(...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1321 void RenderFrameImpl::OnDisownOpener() { | 1322 void RenderFrameImpl::OnDisownOpener() { |
1322 // TODO(creis): We should only see this for main frames for now. To support | 1323 // TODO(creis): We should only see this for main frames for now. To support |
1323 // disowning the opener on subframes, we will need to move WebContentsImpl's | 1324 // disowning the opener on subframes, we will need to move WebContentsImpl's |
1324 // opener_ to FrameTreeNode. | 1325 // opener_ to FrameTreeNode. |
1325 CHECK(!frame_->parent()); | 1326 CHECK(!frame_->parent()); |
1326 | 1327 |
1327 if (frame_->opener()) | 1328 if (frame_->opener()) |
1328 frame_->setOpener(NULL); | 1329 frame_->setOpener(NULL); |
1329 } | 1330 } |
1330 | 1331 |
| 1332 // PlzNavigate |
| 1333 void RenderFrameImpl::OnCommitNavigation( |
| 1334 const FrameMsg_CommitNavigation_Params& params) { |
| 1335 NOTREACHED(); |
| 1336 } |
| 1337 |
1331 #if defined(OS_ANDROID) | 1338 #if defined(OS_ANDROID) |
1332 void RenderFrameImpl::OnSelectPopupMenuItems( | 1339 void RenderFrameImpl::OnSelectPopupMenuItems( |
1333 bool canceled, | 1340 bool canceled, |
1334 const std::vector<int>& selected_indices) { | 1341 const std::vector<int>& selected_indices) { |
1335 // It is possible to receive more than one of these calls if the user presses | 1342 // It is possible to receive more than one of these calls if the user presses |
1336 // a select faster than it takes for the show-select-popup IPC message to make | 1343 // a select faster than it takes for the show-select-popup IPC message to make |
1337 // it to the browser UI thread. Ignore the extra-messages. | 1344 // it to the browser UI thread. Ignore the extra-messages. |
1338 // TODO(jcivelli): http:/b/5793321 Implement a better fix, as detailed in bug. | 1345 // TODO(jcivelli): http:/b/5793321 Implement a better fix, as detailed in bug. |
1339 if (!external_popup_menu_) | 1346 if (!external_popup_menu_) |
1340 return; | 1347 return; |
(...skipping 2540 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3881 | 3888 |
3882 #if defined(ENABLE_BROWSER_CDMS) | 3889 #if defined(ENABLE_BROWSER_CDMS) |
3883 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 3890 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
3884 if (!cdm_manager_) | 3891 if (!cdm_manager_) |
3885 cdm_manager_ = new RendererCdmManager(this); | 3892 cdm_manager_ = new RendererCdmManager(this); |
3886 return cdm_manager_; | 3893 return cdm_manager_; |
3887 } | 3894 } |
3888 #endif // defined(ENABLE_BROWSER_CDMS) | 3895 #endif // defined(ENABLE_BROWSER_CDMS) |
3889 | 3896 |
3890 } // namespace content | 3897 } // namespace content |
OLD | NEW |