diff options
| author | rhashimoto@chromium.org <rhashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 16:54:12 +0000 |
|---|---|---|
| committer | rhashimoto@chromium.org <rhashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 16:54:12 +0000 |
| commit | b516e2d2ff5ad3d2a7c754b081566137fd7ed089 (patch) | |
| tree | 75d5a32b65ce6b417eba6ff42fe0dbe3d1d8c5b1 /chrome_frame/external_tab.cc | |
| parent | 471072f9fd132a46b24ddd159922f6a4d099707d (diff) | |
| download | chromium_src-b516e2d2ff5ad3d2a7c754b081566137fd7ed089.zip chromium_src-b516e2d2ff5ad3d2a7c754b081566137fd7ed089.tar.gz chromium_src-b516e2d2ff5ad3d2a7c754b081566137fd7ed089.tar.bz2 | |
Convert RenderViewContextMenu to MenuItemView.
This CL is part of general GTK removal for ChromiumOS. Menu2 uses GTK on linux so we are replacing it with MenuItemView. Chrome Frame currently passes the context menu between processes by using the HMENU. Because MenuItemView does not use HMENU, we need to use another mechanism.
This CL creates a ContextMenuModel struct that is serialized into an automation message for Chrome Frame. ContextMenuModel contains the context menu definition in-band replacing the out-of-band HMENU.
BUG=chromium-os:13887
TEST=none
Review URL: http://codereview.chromium.org/7167002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92182 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/external_tab.cc')
| -rw-r--r-- | chrome_frame/external_tab.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome_frame/external_tab.cc b/chrome_frame/external_tab.cc index c9eb204..6be47a7 100644 --- a/chrome_frame/external_tab.cc +++ b/chrome_frame/external_tab.cc @@ -282,11 +282,12 @@ void ExternalTabProxy::OnHandleAccelerator(const MSG& accel_message) { } void ExternalTabProxy::OnHandleContextMenu( - HANDLE menu_handle, + const ContextMenuModel& context_menu_model, int align_flags, const MiniContextMenuParams& params) { ui_.PostTask(FROM_HERE, NewRunnableMethod(ui_delegate_, - &UIDelegate::OnHandleContextMenu, menu_handle, align_flags, params)); + &UIDelegate::OnHandleContextMenu, context_menu_model, align_flags, + params)); } void ExternalTabProxy::OnTabbedOut(bool reverse) { |