diff options
| author | spang@chromium.org <spang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-02 21:55:28 +0000 |
|---|---|---|
| committer | spang@chromium.org <spang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-02 21:55:28 +0000 |
| commit | 94c520ce9a1492153d823441e02dc649ac56e299 (patch) | |
| tree | 37d37385d89e06699c97de7babf44b5922b97cbb | |
| parent | fd9ad772d04867f151558bacaa164dcf0ad9dead (diff) | |
| download | chromium_src-94c520ce9a1492153d823441e02dc649ac56e299.zip chromium_src-94c520ce9a1492153d823441e02dc649ac56e299.tar.gz chromium_src-94c520ce9a1492153d823441e02dc649ac56e299.tar.bz2 | |
ozone: Fix chromeos=1 use_ozone=1 chrome build
BUG=354034
TEST=build & unit_tests
R=derat@chromium.org
TBR=derat
Review URL: https://codereview.chromium.org/265813008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267934 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/chrome_browser_main_chromeos.cc | 2 | ||||
| -rw-r--r-- | chrome/chrome_browser_chromeos.gypi | 7 | ||||
| -rw-r--r-- | chrome/chrome_tests_unit.gypi | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc index db7e711..f4d2074 100644 --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc @@ -30,6 +30,7 @@ #include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h" #include "chrome/browser/chromeos/boot_times_loader.h" #include "chrome/browser/chromeos/dbus/cros_dbus_service.h" +#include "chrome/browser/chromeos/events/event_rewriter.h" #include "chrome/browser/chromeos/events/event_rewriter_controller.h" #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h" #include "chrome/browser/chromeos/extensions/default_app_order.h" @@ -116,7 +117,6 @@ // Exclude X11 dependents for ozone #if defined(USE_X11) #include "chrome/browser/chromeos/device_uma.h" -#include "chrome/browser/chromeos/events/event_rewriter.h" #include "chrome/browser/chromeos/events/system_key_event_listener.h" #include "chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener.h" #endif diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi index 1515f62..cc23933 100644 --- a/chrome/chrome_browser_chromeos.gypi +++ b/chrome/chrome_browser_chromeos.gypi @@ -1080,12 +1080,13 @@ '../ui/ozone/ozone.gyp:ozone', ], 'sources!': [ + 'browser/chromeos/events/system_key_event_listener.cc', + 'browser/chromeos/events/system_key_event_listener.h', + 'browser/chromeos/events/xinput_hierarchy_changed_event_listener.cc', + 'browser/chromeos/events/xinput_hierarchy_changed_event_listener.h', 'browser/chromeos/input_method/input_method_engine.cc', 'browser/chromeos/input_method/input_method_engine.h', ], - 'sources/': [ - ['exclude', '^browser/chromeos/events/'], - ], }], ], }, diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index 36a25da..ad9cba8 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -2699,13 +2699,13 @@ }], ['use_ozone==1', { 'sources!': [ + # crbug.com/354036 + 'browser/chromeos/events/event_rewriter_unittest.cc', + # crbug.com/362698 'browser/chromeos/input_method/input_method_engine_unittest.cc', 'browser/chromeos/input_method/input_method_manager_impl_unittest.cc', ], - 'sources/': [ - ['exclude', '^browser/chromeos/events/'], # crbug.com/354036 - ], }], ['enable_plugin_installation==0', { 'sources!': [ |