diff options
| author | spang@chromium.org <spang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-10 05:19:21 +0000 |
|---|---|---|
| committer | spang@chromium.org <spang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-10 05:19:21 +0000 |
| commit | 09f749c9281b96d9fccbf8f517b26030fd60786c (patch) | |
| tree | 9371c24db2e0f8304cfe4f4692246f384f64156c /chrome/browser/chromeos/system | |
| parent | 0be46afe17e49379ac6383b1f349891b4649b634 (diff) | |
| download | chromium_src-09f749c9281b96d9fccbf8f517b26030fd60786c.zip chromium_src-09f749c9281b96d9fccbf8f517b26030fd60786c.tar.gz chromium_src-09f749c9281b96d9fccbf8f517b26030fd60786c.tar.bz2 | |
chromeos: Exclude browser/chromeos/events/ under ozone
This event code is all currently X11-specific. Remove it from the
ChromeOS-on-Ozone build.
BUG=361341
TEST=chrome --ozone-platform=test
Review URL: https://codereview.chromium.org/226413008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262927 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/system')
| -rw-r--r-- | chrome/browser/chromeos/system/pointer_device_observer.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/system/pointer_device_observer.cc b/chrome/browser/chromeos/system/pointer_device_observer.cc index ca118f25..29bbd67 100644 --- a/chrome/browser/chromeos/system/pointer_device_observer.cc +++ b/chrome/browser/chromeos/system/pointer_device_observer.cc @@ -7,10 +7,13 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" -#include "chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener.h" #include "chrome/browser/chromeos/system/input_device_settings.h" #include "content/public/browser/browser_thread.h" +#if defined(USE_X11) +#include "chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener.h" +#endif + using content::BrowserThread; namespace chromeos { @@ -21,13 +24,17 @@ PointerDeviceObserver::PointerDeviceObserver() } PointerDeviceObserver::~PointerDeviceObserver() { +#if defined(USE_X11) XInputHierarchyChangedEventListener::GetInstance() ->RemoveObserver(this); +#endif } void PointerDeviceObserver::Init() { +#if defined(USE_X11) XInputHierarchyChangedEventListener::GetInstance() ->AddObserver(this); +#endif } void PointerDeviceObserver::CheckDevices() { |