Rename gfx::Monitor to gfx::Display

ui/gfx/monitor.cc

Index: ui/gfx/monitor.cc
diff --git a/ui/gfx/monitor.cc b/ui/gfx/monitor.cc
deleted file mode 100644
index 12d4dab8e0c714d3a50640ddcb1915db6e750c34..0000000000000000000000000000000000000000
--- a/ui/gfx/monitor.cc
+++ /dev/null
@@ -1,111 +0,0 @@
-// 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/gfx/monitor.h"
-
-#include "base/command_line.h"
-#include "base/logging.h"
-#include "base/string_number_conversions.h"
-#include "base/stringprintf.h"
-#include "ui/base/ui_base_switches.h"
-#include "ui/gfx/insets.h"
-
-namespace gfx {
-namespace {
-
-float GetDefaultDeviceScaleFactorImpl() {
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  double scale_in_double = 1.0;
-  if (command_line.HasSwitch(switches::kDefaultDeviceScaleFactor)) {
-    std::string value =
-        command_line.GetSwitchValueASCII(switches::kDefaultDeviceScaleFactor);
-    if (!base::StringToDouble(value, &scale_in_double))
-      LOG(ERROR) << "Failed to parse the deafult device scale factor:" << value;
-  }
-  return static_cast<float>(scale_in_double);
-}
-
-} // namespace
-
-// static
-float Monitor::GetDefaultDeviceScaleFactor() {
-  static const float kDefaultDeviceScaleFactor =
-      GetDefaultDeviceScaleFactorImpl();
-  return kDefaultDeviceScaleFactor;
-}
-
-Monitor::Monitor()
-    : id_(-1),
-      device_scale_factor_(GetDefaultDeviceScaleFactor()) {
-}
-
-Monitor::Monitor(int id)
-    : id_(id),
-      device_scale_factor_(GetDefaultDeviceScaleFactor()) {
-}
-
-Monitor::Monitor(int id, const gfx::Rect& bounds)
-    : id_(id),
-      bounds_(bounds),
-      work_area_(bounds),
-      device_scale_factor_(GetDefaultDeviceScaleFactor()) {
-#if defined(USE_AURA)
-  SetScaleAndBounds(device_scale_factor_, bounds);
-#endif
-}
-
-Monitor::~Monitor() {
-}
-
-Insets Monitor::GetWorkAreaInsets() const {
-  return gfx::Insets(work_area_.y() - bounds_.y(),
-                     work_area_.x() - bounds_.x(),
-                     bounds_.bottom() - work_area_.bottom(),
-                     bounds_.right() - work_area_.right());
-}
-
-void Monitor::SetScaleAndBounds(
-    float device_scale_factor,
-    const gfx::Rect& bounds_in_pixel) {
-  Insets insets = bounds_.InsetsFrom(work_area_);
-  device_scale_factor_ = device_scale_factor;
-#if defined(USE_AURA)
-  bounds_in_pixel_ = bounds_in_pixel;
-#endif
-  // TODO(oshima): For m19, work area/monitor bounds that chrome/webapps sees
-  // has (0, 0) origin because it's simpler and enough. Fix this when
-  // real multi monitor support is implemented.
-  bounds_ = gfx::Rect(
-      bounds_in_pixel.size().Scale(1.0f / device_scale_factor_));
-  UpdateWorkAreaFromInsets(insets);
-}
-
-void Monitor::SetSize(const gfx::Size& size_in_pixel) {
-  SetScaleAndBounds(
-      device_scale_factor_,
-#if defined(USE_AURA)
-      gfx::Rect(bounds_in_pixel_.origin(), size_in_pixel));
-#else
-      gfx::Rect(bounds_.origin(), size_in_pixel));
-#endif
-}
-
-void Monitor::UpdateWorkAreaFromInsets(const gfx::Insets& insets) {
-  work_area_ = bounds_;
-  work_area_.Inset(insets);
-}
-
-gfx::Size Monitor::GetSizeInPixel() const {
-  return size().Scale(device_scale_factor_);
-}
-
-std::string Monitor::ToString() const {
-  return base::StringPrintf("Monitor[%d] bounds=%s, workarea=%s, scale=%f",
-                            id_,
-                            bounds_.ToString().c_str(),
-                            work_area_.ToString().c_str(),
-                            device_scale_factor_);
-}
-
-}  // namespace gfx