Move IsRunningOnChromeOS to SysInfo

ash/display/display_manager.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 "ash/display/display_manager.h"
 
 #include <cmath>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 15 matching lines @@
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size_conversions.h"
 
 #if defined(USE_X11)
 #include "ui/base/x/x11_util.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "ash/display/output_configurator_animation.h"
-#include "base/chromeos/chromeos_version.h"
+#include "base/sys_info.h"
 #include "chromeos/display/output_configurator.h"
 #endif
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 namespace ash {
 namespace internal {
 typedef std::vector<gfx::Display> DisplayList;
@@ skipping 95 matching lines @@
 
 DisplayManager::DisplayManager()
     : delegate_(NULL),
       layout_store_(new DisplayLayoutStore),
       first_display_id_(gfx::Display::kInvalidDisplayID),
       num_connected_displays_(0),
       force_bounds_changed_(false),
       change_display_upon_host_resize_(false),
       software_mirroring_enabled_(false) {
 #if defined(OS_CHROMEOS)
-  change_display_upon_host_resize_ = !base::chromeos::IsRunningOnChromeOS();
+  change_display_upon_host_resize_ = !base::SysInfo::IsRunningOnChromeOS();
 #endif
 }
 
 DisplayManager::~DisplayManager() {
 }
 
 // static
 std::vector<float> DisplayManager::GetScalesForDisplay(
     const DisplayInfo& info) {
   std::vector<float> ret;
   if (info.device_scale_factor() == 2.0f) {
     ret.assign(kUIScalesFor2x, kUIScalesFor2x + arraysize(kUIScalesFor2x));
     return ret;
   }
   switch (info.bounds_in_native().width()) {
     case 1280:
       ret.assign(kUIScalesFor1280,
                  kUIScalesFor1280 + arraysize(kUIScalesFor1280));
       break;
     case 1366:
       ret.assign(kUIScalesFor1366,
                  kUIScalesFor1366 + arraysize(kUIScalesFor1366));
       break;
     default:
       ret.assign(kUIScalesFor1280,
                  kUIScalesFor1280 + arraysize(kUIScalesFor1280));
 #if defined(OS_CHROMEOS)
-      if (base::chromeos::IsRunningOnChromeOS())
+      if (base::SysInfo::IsRunningOnChromeOS())
         NOTREACHED() << "Unknown resolution:" << info.ToString();
 #endif
   }
   return ret;
 }
 
 // static
 float DisplayManager::GetNextUIScale(const DisplayInfo& info, bool up) {
   float scale = info.ui_scale();
   std::vector<float> scales = GetScalesForDisplay(info);
@@ skipping 190 matching lines @@
     LOG(WARNING) << "Unsupported resolution was requested:"
                  << resolution.ToString();
     return;
   } else if (iter == resolutions.begin()) {
     // The best resolution was set, so forget it.
     resolutions_.erase(display_id);
   } else {
     resolutions_[display_id] = resolution;
   }
 #if defined(OS_CHROMEOS) && defined(USE_X11)
-  if (base::chromeos::IsRunningOnChromeOS())
+  if (base::SysInfo::IsRunningOnChromeOS())
     Shell::GetInstance()->output_configurator()->ScheduleConfigureOutputs();
 #endif
 }
 
 void DisplayManager::RegisterDisplayProperty(
     int64 display_id,
     gfx::Display::Rotation rotation,
     float ui_scale,
     const gfx::Insets* overscan_insets,
     const gfx::Size& resolution_in_pixels) {
@@ skipping 268 matching lines @@
   // from dock mode to software mirror mode.
   mirror_window_updater.reset();
   for (std::vector<size_t>::iterator iter = changed_display_indices.begin();
        iter != changed_display_indices.end(); ++iter) {
     Shell::GetInstance()->screen()->NotifyBoundsChanged(displays_[*iter]);
   }
   if (delegate_)
     delegate_->PostDisplayConfigurationChange();
 
 #if defined(USE_X11) && defined(OS_CHROMEOS)
-  if (!changed_display_indices.empty() && base::chromeos::IsRunningOnChromeOS())
+  if (!changed_display_indices.empty() && base::SysInfo::IsRunningOnChromeOS())
     ui::ClearX11DefaultRootWindow();
 #endif
 }
 
 const gfx::Display& DisplayManager::GetDisplayAt(size_t index) const {
   DCHECK_LT(index, displays_.size());
   return displays_[index];
 }
 
 const gfx::Display& DisplayManager::GetPrimaryDisplayCandidate() const {
@@ skipping 38 matching lines @@
   display_id = first_display_id();
 #endif
   return display_id;
 }
 
 void DisplayManager::SetMirrorMode(bool mirrored) {
   if (num_connected_displays() <= 1)
     return;
 
 #if defined(OS_CHROMEOS)
-  if (base::chromeos::IsRunningOnChromeOS()) {
+  if (base::SysInfo::IsRunningOnChromeOS()) {
     chromeos::OutputState new_state = mirrored ?
         chromeos::STATE_DUAL_MIRROR : chromeos::STATE_DUAL_EXTENDED;
     Shell::GetInstance()->output_configurator()->SetDisplayMode(new_state);
     return;
   }
 #endif
   SetSoftwareMirroring(mirrored);
   DisplayInfoList display_info_list;
   int count = 0;
   for (std::map<int64, DisplayInfo>::const_iterator iter =
@@ skipping 192 matching lines @@
       break;
   }
   gfx::Insets insets = secondary_display->GetWorkAreaInsets();
   secondary_display->set_bounds(
       gfx::Rect(new_secondary_origin, secondary_bounds.size()));
   secondary_display->UpdateWorkAreaFromInsets(insets);
 }
 
 }  // namespace internal
 }  // namespace ash