ozone: Protect X11-specific code in chrome/browser/metrics

chrome/browser/metrics/metrics_log_chromeos.cc

Index: chrome/browser/metrics/metrics_log_chromeos.cc
diff --git a/chrome/browser/metrics/metrics_log_chromeos.cc b/chrome/browser/metrics/metrics_log_chromeos.cc
index a33e9c830d902a8e721d61dc5aa301b0618d6d97..4b829c456ad5fbac686e188f17ba9c5d38a4b16f 100644
--- a/chrome/browser/metrics/metrics_log_chromeos.cc
+++ b/chrome/browser/metrics/metrics_log_chromeos.cc
@@ -15,9 +15,12 @@
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "ui/events/event_utils.h"
-#include "ui/events/x/touch_factory_x11.h"
 #include "ui/gfx/screen.h"
 
+#if defined(USE_X11)
+#include "ui/events/x/touch_factory_x11.h"
+#endif

[Ilya Sherman, 2014/04/09 23:56:50]

nit: "  // defined(USE_X11)"

[spang, 2014/04/10 00:09:05]

Done.

+
 using metrics::ChromeUserMetricsExtension;
 using metrics::PerfDataProto;
 using metrics::SystemProfileProto;
@@ -63,6 +66,7 @@ PairedDevice::Type AsBluetoothDeviceType(
 }
 
 void WriteExternalTouchscreensProto(SystemProfileProto::Hardware* hardware) {
+#if defined(USE_X11)
   std::set<std::pair<int, int> > touchscreen_ids =
       ui::TouchFactory::GetInstance()->GetTouchscreenIds();
   for (std::set<std::pair<int, int> >::iterator it = touchscreen_ids.begin();
@@ -73,6 +77,7 @@ void WriteExternalTouchscreensProto(SystemProfileProto::Hardware* hardware) {
     touchscreen->set_vendor_id(it->first);
     touchscreen->set_product_id(it->second);
   }
+#endif

[Ilya Sherman, 2014/04/09 23:56:50]

nit: "  // defined(USE_X11)"

[spang, 2014/04/10 00:09:05]

Done.

 }
 
 }  // namespace