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

4 files changed, 26 insertions, 9 deletions

diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 4979adf..617977a 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -30,9 +30,6 @@
 #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/system_key_event_listener.h"
-#include "chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener.h"
 #include "chrome/browser/chromeos/extensions/default_app_order.h"
 #include "chrome/browser/chromeos/extensions/extension_system_event_observer.h"
 #include "chrome/browser/chromeos/external_metrics.h"
@@ -114,6 +111,9 @@
 // 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
 
 namespace chromeos {
@@ -426,6 +426,7 @@ void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() {
   imageburner::BurnManager::Initialize(
       downloads_directory, g_browser_process->system_request_context());
 
+#if defined(USE_X11)
   // Listen for system key events so that the user will be able to adjust the
   // volume on the login screen, if Chrome is running on Chrome OS
   // (i.e. not Linux desktop), and in non-test mode.
@@ -434,6 +435,7 @@ void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() {
       !parameters().ui_task) {  // ui_task is non-NULL when running tests.
     SystemKeyEventListener::Initialize();
   }
+#endif
 
   DeviceOAuth2TokenServiceFactory::Initialize();
 
@@ -692,17 +694,17 @@ void ChromeBrowserMainPartsChromeos::PreBrowserStart() {
 
   g_browser_process->metrics_service()->StartExternalMetrics();
 
+#if defined(USE_X11)
   // Listen for XI_HierarchyChanged events. Note: if this is moved to
   // PreMainMessageLoopRun() then desktopui_PageCyclerTests fail for unknown
   // reasons, see http://crosbug.com/24833.
   XInputHierarchyChangedEventListener::GetInstance();
 
-#if defined(USE_X11)
   // Start the CrOS input device UMA watcher
   DeviceUMA::GetInstance();
-#endif
 
   event_rewriter_.reset(new EventRewriter());
+#endif
 
   // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun()
   // -- immediately after ChildProcess::WaitForDebugger().
@@ -765,24 +767,26 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
   retail_mode_power_save_blocker_.reset();
   peripheral_battery_observer_.reset();
   power_prefs_.reset();
-  event_rewriter_.reset();
 
   // Let the ScreenLocker unregister itself from SessionManagerClient before
   // DBusThreadManager is shut down.
   if (!KioskModeSettings::Get()->IsKioskModeEnabled())
     ScreenLocker::ShutDownClass();
 
+#if defined(USE_X11)
+  event_rewriter_.reset();
+
   // The XInput2 event listener needs to be shut down earlier than when
   // Singletons are finally destroyed in AtExitManager.
   XInputHierarchyChangedEventListener::GetInstance()->Stop();
 
-#if defined(USE_X11)
   DeviceUMA::GetInstance()->Stop();
-#endif
 
   // SystemKeyEventListener::Shutdown() is always safe to call,
   // even if Initialize() wasn't called.
   SystemKeyEventListener::Shutdown();
+#endif
+
   imageburner::BurnManager::Shutdown();
   CrasAudioHandler::Shutdown();
 
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.h b/chrome/browser/chromeos/chrome_browser_main_chromeos.h
index c9bc75e..7dc069d 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.h
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.h
@@ -67,7 +67,10 @@ class ChromeBrowserMainPartsChromeos : public ChromeBrowserMainPartsLinux {
   scoped_ptr<DataPromoNotification> data_promo_notification_;
 
   scoped_ptr<internal::DBusServices> dbus_services_;
+
+#if defined(USE_X11)
   scoped_ptr<EventRewriter> event_rewriter_;
+#endif
 
   VersionLoader cros_version_loader_;
   base::CancelableTaskTracker tracker_;
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() {
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index 8f21086..14b5a92 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -1036,6 +1036,9 @@
           'dependencies': [
             '../ui/ozone/ozone.gyp:ozone',
           ],
+          'sources/': [
+            ['exclude', '^browser/chromeos/events/'],
+          ],
         }],
       ],
     },