diff options
| author | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-02 04:04:24 +0000 |
|---|---|---|
| committer | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-02 04:04:24 +0000 |
| commit | 8d91cb8f1a86cc7f64190acd30b593e6b9e400a7 (patch) | |
| tree | 1c489f555b5d4316b3628f37b6a02dea7e014a28 /chrome/browser/ui/browser_command_controller.cc | |
| parent | cf15ad7b1bae1fe02f592a5bf740408b9a180ac1 (diff) | |
| download | chromium_src-8d91cb8f1a86cc7f64190acd30b593e6b9e400a7.zip chromium_src-8d91cb8f1a86cc7f64190acd30b593e6b9e400a7.tar.gz chromium_src-8d91cb8f1a86cc7f64190acd30b593e6b9e400a7.tar.bz2 | |
Replace #ifdef(OS_LINUX) with #ifdef(USE_X11) for x11 specific code
This fixes the Ozone FYI builder.
https://codereview.chromium.org/213283004 added X11 specific code but uses OS_LINUX to enable it. The Ozone build is a linux build but without X11, thus failing tests.
TESTS=Manually ran content_browsertests content_unittests components_unittests with an Ozone build
Review URL: https://codereview.chromium.org/217323008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261058 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_command_controller.cc')
| -rw-r--r-- | chrome/browser/ui/browser_command_controller.cc | 4 |
1 files changed, 2 insertions, 2 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 = |