Move IsRunningOnChromeOS to SysInfo

ui/aura/root_window_host_x11.cc

 // Copyright (c) 2012 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 "ui/aura/root_window_host_x11.h"
 
 #include <strings.h>
 #include <X11/cursorfont.h>
 #include <X11/extensions/Xfixes.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/extensions/Xrandr.h>
 #include <X11/Xatom.h>
 #include <X11/Xcursor/Xcursor.h>
 #include <X11/Xlib.h>
 
 #include <algorithm>
 #include <limits>
 #include <string>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_pump_x11.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
+#include "base/sys_info.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/client/user_action_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/touch/touch_factory_x11.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/base/view_prop.h"
 #include "ui/base/x/device_list_cache_x.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/compositor/layer.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/screen.h"
 
-#if defined(OS_CHROMEOS)
-#include "base/chromeos/chromeos_version.h"
-#endif
-
 using std::max;
 using std::min;
 
 namespace aura {
 
 namespace {
 
 // Standard Linux mouse buttons for going back and forward.
 const int kBackMouseButton = 8;
 const int kForwardMouseButton = 9;
@@ skipping 862 matching lines @@
           bezel_tracking_ids_ |= tracking_id;
         if (bezel_tracking_ids_ & tracking_id) {
           if (type == ui::ET_TOUCH_CANCELLED || type == ui::ET_TOUCH_RELEASED)
             bezel_tracking_ids_ =
                 (bezel_tracking_ids_ | tracking_id) ^ tracking_id;
           return;
         }
       }
 #endif  // defined(USE_XI2_MT)
 #if defined(OS_CHROMEOS)
-      if (base::chromeos::IsRunningOnChromeOS()) {
+      if (base::SysInfo::IsRunningOnChromeOS()) {
         if (!bounds_.Contains(touchev.location()))
           break;
         // X maps the touch-surface to the size of the X root-window.
         // In multi-monitor setup, Coordinate Transformation Matrix
         // repositions the touch-surface onto part of X root-window
         // containing aura root-window corresponding to the touchscreen.
         // However, if aura root-window has non-zero origin,
         // we need to relocate the event into aura root-window coordinates.
         touchev.Relocate(bounds_.origin());
 #if defined(USE_XI2_MT)
@@ skipping 151 matching lines @@
 }
 
 namespace test {
 
 void SetUseOverrideRedirectWindowByDefault(bool override_redirect) {
   default_override_redirect = override_redirect;
 }
 
 }  // namespace test
 }  // namespace aura