diff options
| -rw-r--r-- | chrome/browser/ui/browser_command_controller.cc | 4 | ||||
| -rw-r--r-- | content/browser/renderer_host/render_widget_host_view_aura.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc index 510221b..b0c2772 100644 --- a/chrome/browser/ui/browser_command_controller.cc +++ b/chrome/browser/ui/browser_command_controller.cc @@ -68,7 +68,7 @@ #include "chrome/browser/ui/browser_commands_chromeos.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(USE_X11) && !defined(OS_CHROMEOS) #include "ui/events/x/text_edit_key_bindings_delegate_x11.h" #endif @@ -287,7 +287,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( if (window()->IsFullscreen() && command_id == IDC_FULLSCREEN) return true; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(TOOLKIT_GTK) +#if defined(USE_X11) && !defined(OS_CHROMEOS) && !defined(TOOLKIT_GTK) // If this key was registered by the user as a content editing hotkey, then // it is not reserved. ui::TextEditKeyBindingsDelegateX11* delegate = diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc index cb76537..723a81b 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc @@ -94,7 +94,7 @@ #include "ui/gfx/win/dpi.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(USE_X11) && !defined(OS_CHROMEOS) #include "content/common/input_messages.h" #include "ui/events/x/text_edit_command_x11.h" #include "ui/events/x/text_edit_key_bindings_delegate_x11.h" @@ -3577,7 +3577,7 @@ void RenderWidgetHostViewAura::DetachFromInputMethod() { void RenderWidgetHostViewAura::ForwardKeyboardEvent( const NativeWebKeyboardEvent& event) { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(USE_X11) && !defined(OS_CHROMEOS) ui::TextEditKeyBindingsDelegateX11* keybinding_delegate = ui::GetTextEditKeyBindingsDelegate(); std::vector<ui::TextEditCommandX11> commands; |