diff options
| author | suzhe@chromium.org <suzhe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 01:20:56 +0000 |
|---|---|---|
| committer | suzhe@chromium.org <suzhe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 01:20:56 +0000 |
| commit | a6ae341e9c13a377e7defbde0c41d29bd6a6184e (patch) | |
| tree | 36f312d5555cdcfe786705687a0cfc05426b01f2 /chrome/browser/renderer_host | |
| parent | 65b6c1aa0dca8cace4a81b1c5eb787a7e937ff0f (diff) | |
| download | chromium_src-a6ae341e9c13a377e7defbde0c41d29bd6a6184e.zip chromium_src-a6ae341e9c13a377e7defbde0c41d29bd6a6184e.tar.gz chromium_src-a6ae341e9c13a377e7defbde0c41d29bd6a6184e.tar.bz2 | |
[Linux]Honour GNOME's show_input_method_menu setting.
BUG=http://crosbug.com/2458
TEST=Disable desktop->gnome->interface->show_input_method_menu option in gconf-editor, and then right click in a webpage's input box. The context menu should not contain input method sub menu.
Review URL: http://codereview.chromium.org/2804024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50803 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host')
| -rw-r--r-- | chrome/browser/renderer_host/gtk_im_context_wrapper.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/renderer_host/gtk_im_context_wrapper.cc b/chrome/browser/renderer_host/gtk_im_context_wrapper.cc index 7ae6810..4b7f7ad 100644 --- a/chrome/browser/renderer_host/gtk_im_context_wrapper.cc +++ b/chrome/browser/renderer_host/gtk_im_context_wrapper.cc @@ -240,6 +240,13 @@ void GtkIMContextWrapper::OnFocusOut() { } void GtkIMContextWrapper::AppendInputMethodsContextMenu(MenuGtk* menu) { + gboolean show_input_method_menu = TRUE; + + g_object_get(gtk_widget_get_settings(GTK_WIDGET(host_view_->native_view())), + "gtk-show-input-method-menu", &show_input_method_menu, NULL); + if (!show_input_method_menu) + return; + std::string label = gtk_util::ConvertAcceleratorsFromWindowsStyle( l10n_util::GetStringUTF8(IDS_CONTENT_CONTEXT_INPUT_METHODS_MENU)); GtkWidget* menuitem = gtk_menu_item_new_with_mnemonic(label.c_str()); |