Rename gfx::Display/Screen to display::Display/Screen in content/

content/browser/renderer_host/render_widget_host_view_base.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 "content/browser/renderer_host/render_widget_host_view_base.h"
 
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/browser/renderer_host/input/synthetic_gesture_target_base.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_delegate.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_base_observer.h"
 #include "content/common/content_switches_internal.h"
 #include "content/public/browser/render_widget_host_view_frame_subscriber.h"
-#include "ui/gfx/display.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
 #include "ui/gfx/geometry/point_conversions.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/geometry/size_f.h"
-#include "ui/gfx/screen.h"
 
 namespace content {
 
 namespace {
 
 // How many microseconds apart input events should be flushed.
 const int kFlushInputRateInUs = 16666;
 
 }
 
 RenderWidgetHostViewBase::RenderWidgetHostViewBase()
     : popup_type_(blink::WebPopupTypeNone),
       background_color_(SK_ColorWHITE),
       mouse_locked_(false),
       showing_context_menu_(false),
       selection_text_offset_(0),
       selection_range_(gfx::Range::InvalidRange()),
       current_device_scale_factor_(0),
-      current_display_rotation_(gfx::Display::ROTATE_0),
+      current_display_rotation_(display::Display::ROTATE_0),
       pinch_zoom_enabled_(content::IsPinchToZoomEnabled()),
       renderer_frame_number_(0),
       weak_factory_(this) {}
 
 RenderWidgetHostViewBase::~RenderWidgetHostViewBase() {
   DCHECK(!mouse_locked_);
   // We call this here to guarantee that observers are notified before we go
   // away. However, some subclasses may wish to call this earlier in their
   // shutdown process, e.g. to force removal from
   // RenderWidgetHostInputEventRouter's surface map before relinquishing a
@@ skipping 23 matching lines @@
 
 void RenderWidgetHostViewBase::SetBackgroundColorToDefault() {
   SetBackgroundColor(SK_ColorWHITE);
 }
 
 bool RenderWidgetHostViewBase::GetBackgroundOpaque() {
   return SkColorGetA(background_color_) == SK_AlphaOPAQUE;
 }
 
 gfx::Size RenderWidgetHostViewBase::GetPhysicalBackingSize() const {
-  gfx::Display display =
-      gfx::Screen::GetScreen()->GetDisplayNearestWindow(GetNativeView());
+  display::Display display =
+      display::Screen::GetScreen()->GetDisplayNearestWindow(GetNativeView());
   return gfx::ScaleToCeiledSize(GetRequestedRendererSize(),
                                 display.device_scale_factor());
 }
 
 bool RenderWidgetHostViewBase::DoTopControlsShrinkBlinkSize() const {
   return false;
 }
 
 float RenderWidgetHostViewBase::GetTopControlsHeight() const {
   return 0.f;
@@ skipping 110 matching lines @@
     impl = RenderWidgetHostImpl::From(GetRenderWidgetHost());
 
   if (impl && impl->delegate())
     impl->delegate()->SendScreenRects();
 
   if (HasDisplayPropertyChanged(view) && impl)
     impl->NotifyScreenInfoChanged();
 }
 
 bool RenderWidgetHostViewBase::HasDisplayPropertyChanged(gfx::NativeView view) {
-  gfx::Display display =
-      gfx::Screen::GetScreen()->GetDisplayNearestWindow(view);
+  display::Display display =
+      display::Screen::GetScreen()->GetDisplayNearestWindow(view);
   if (current_display_area_ == display.work_area() &&
       current_device_scale_factor_ == display.device_scale_factor() &&
       current_display_rotation_ == display.rotation()) {
     return false;
   }
 
   current_display_area_ = display.work_area();
   current_device_scale_factor_ = display.device_scale_factor();
   current_display_rotation_ = display.rotation();
   return true;
@@ skipping 55 matching lines @@
   return GetViewBounds().size();
 }
 
 void RenderWidgetHostViewBase::SetInsets(const gfx::Insets& insets) {
   NOTIMPLEMENTED();
 }
 
 // static
 blink::WebScreenOrientationType
 RenderWidgetHostViewBase::GetOrientationTypeForMobile(
-    const gfx::Display& display) {
+    const display::Display& display) {
   int angle = display.RotationAsDegree();
   const gfx::Rect& bounds = display.bounds();
 
   // Whether the device's natural orientation is portrait.
   bool natural_portrait = false;
   if (angle == 0 || angle == 180) // The device is in its natural orientation.
     natural_portrait = bounds.height() >= bounds.width();
   else
     natural_portrait = bounds.height() <= bounds.width();
 
@@ skipping 12 matching lines @@
                            : blink::WebScreenOrientationPortraitPrimary;
   default:
     NOTREACHED();
     return blink::WebScreenOrientationPortraitPrimary;
   }
 }
 
 // static
 blink::WebScreenOrientationType
 RenderWidgetHostViewBase::GetOrientationTypeForDesktop(
-    const gfx::Display& display) {
+    const display::Display& display) {
   static int primary_landscape_angle = -1;
   static int primary_portrait_angle = -1;
 
   int angle = display.RotationAsDegree();
   const gfx::Rect& bounds = display.bounds();
   bool is_portrait = bounds.height() >= bounds.width();
 
   if (is_portrait && primary_portrait_angle == -1)
     primary_portrait_angle = angle;
 
@@ skipping 56 matching lines @@
 
 bool RenderWidgetHostViewBase::IsChildFrameForTesting() const {
   return false;
 }
 
 cc::SurfaceId RenderWidgetHostViewBase::SurfaceIdForTesting() const {
   return cc::SurfaceId();
 }
 
 }  // namespace content