diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-11 16:27:25 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-11 16:27:25 +0000 |
| commit | c02ecb834297e41993b0546fb57156ec2ab2563f (patch) | |
| tree | a393d011cfd1ba6181e789b547a7b6ccfb54a8ee /chrome/browser/renderer_host/gtk_im_context_wrapper.h | |
| parent | 1ecd85c2e2d586d18647748c5caed0fa3284b2e3 (diff) | |
| download | chromium_src-c02ecb834297e41993b0546fb57156ec2ab2563f.zip chromium_src-c02ecb834297e41993b0546fb57156ec2ab2563f.tar.gz chromium_src-c02ecb834297e41993b0546fb57156ec2ab2563f.tar.bz2 | |
Lands http://codereview.chromium.org/2878087 for Alex:
Remove menu_gtk from the link for TOOLKIT_VIEWS builds.
BUG=none
TEST=manually, both with TOOLKIT_VIEWS=1 and TOOLKIT_VIEWS=0
Review URL: http://codereview.chromium.org/3130005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55733 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host/gtk_im_context_wrapper.h')
| -rw-r--r-- | chrome/browser/renderer_host/gtk_im_context_wrapper.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/renderer_host/gtk_im_context_wrapper.h b/chrome/browser/renderer_host/gtk_im_context_wrapper.h index 5d81968..1e4c980 100644 --- a/chrome/browser/renderer_host/gtk_im_context_wrapper.h +++ b/chrome/browser/renderer_host/gtk_im_context_wrapper.h @@ -20,7 +20,9 @@ namespace gfx { class Rect; } +#if !defined(TOOLKIT_VIEWS) class MenuGtk; +#endif class RenderWidgetHostViewGtk; struct NativeWebKeyboardEvent; typedef struct _GtkIMContext GtkIMContext; @@ -50,7 +52,11 @@ class GtkIMContextWrapper { void OnFocusIn(); void OnFocusOut(); +#if !defined(TOOLKIT_VIEWS) + // Not defined for views because the views context menu doesn't + // implement input methods yet. void AppendInputMethodsContextMenu(MenuGtk* menu); +#endif void CancelComposition(); |