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

chrome/browser/metrics/metrics_log_chromeos.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/metrics/metrics_log_chromeos.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/common/metrics/proto/chrome_user_metrics_extension.pb.h"
 #include "chrome/common/pref_names.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "ui/events/event_utils.h"
+#include "ui/gfx/screen.h"
+
+#if defined(USE_X11)
 #include "ui/events/x/touch_factory_x11.h"
-#include "ui/gfx/screen.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;
 typedef SystemProfileProto::Hardware::Bluetooth::PairedDevice PairedDevice;
 
 namespace {
 
 PairedDevice::Type AsBluetoothDeviceType(
     device::BluetoothDevice::DeviceType device_type) {
@@ skipping 26 matching lines @@
       return PairedDevice::DEVICE_TABLET;
     case device::BluetoothDevice::DEVICE_KEYBOARD_MOUSE_COMBO:
       return PairedDevice::DEVICE_KEYBOARD_MOUSE_COMBO;
   }
 
   NOTREACHED();
   return PairedDevice::DEVICE_UNKNOWN;
 }
 
 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();
        it != touchscreen_ids.end();
        ++it) {
     SystemProfileProto::Hardware::TouchScreen* touchscreen =
         hardware->add_external_touchscreen();
     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
 
 MetricsLogChromeOS::~MetricsLogChromeOS() {
 }
 
 MetricsLogChromeOS::MetricsLogChromeOS(ChromeUserMetricsExtension* uma_proto)
     : uma_proto_(uma_proto) {
   UpdateMultiProfileUserCount();
@@ skipping 116 matching lines @@
     }
 
     system_profile->set_multi_profile_user_count(user_count);
   }
 }
 
 void MetricsLogChromeOS::SetBluetoothAdapter(
     scoped_refptr<device::BluetoothAdapter> adapter) {
   adapter_ = adapter;
 }