Rename gfx::Monitor to gfx::Display

ash/touch/touch_observer_hud.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/touch/touch_observer_hud.h"
 
 #include "ash/shell_window_ids.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkXfermode.h"
 #include "ui/aura/event.h"
 #include "ui/gfx/canvas.h"
-#include "ui/gfx/monitor.h"
+#include "ui/gfx/display.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace internal {
@@ skipping 10 matching lines @@
   SK_ColorWHITE,
   SK_ColorBLACK
 };
 
 class TouchHudCanvas : public views::View {
  public:
   explicit TouchHudCanvas(TouchObserverHUD* owner)
       : owner_(owner),
         path_index_(0),
         color_index_(0) {
-    gfx::Monitor monitor = gfx::Screen::GetPrimaryMonitor();
-    gfx::Rect bounds = monitor.bounds();
+    gfx::Display display = gfx::Screen::GetPrimaryMonitor();
+    gfx::Rect bounds = display.bounds();
     size_.set_width(bounds.width() / kScale);
     size_.set_height(bounds.height() / kScale);
   }
 
   virtual ~TouchHudCanvas() {}
 
   void Start(int id, const gfx::Point& point) {
     paths_[path_index_].reset();
     paths_[path_index_].moveTo(SkIntToScalar(point.x() / kScale),
                       SkIntToScalar(point.y() / kScale));
@@ skipping 150 matching lines @@
 }
 
 ui::GestureStatus TouchObserverHUD::PreHandleGestureEvent(
     aura::Window* target,
     aura::GestureEvent* event) {
   return ui::GESTURE_STATUS_UNKNOWN;
 }
 
 }  // namespace internal
 }  // namespace ash