Change blink::WebScreenInfo to content::ScreenInfo

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"
@@ skipping 338 matching lines @@
 
 gfx::Size RenderWidgetHostViewBase::GetVisibleViewportSize() const {
   return GetViewBounds().size();
 }
 
 void RenderWidgetHostViewBase::SetInsets(const gfx::Insets& insets) {
   NOTIMPLEMENTED();
 }
 
 // static
-blink::WebScreenOrientationType
-RenderWidgetHostViewBase::GetOrientationTypeForMobile(
+ScreenOrientationValues RenderWidgetHostViewBase::GetOrientationTypeForMobile(
     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();
 
   switch (angle) {
   case 0:
-    return natural_portrait ? blink::WebScreenOrientationPortraitPrimary
-                           : blink::WebScreenOrientationLandscapePrimary;
+    return natural_portrait ? SCREEN_ORIENTATION_VALUES_PORTRAIT_PRIMARY
+                            : SCREEN_ORIENTATION_VALUES_LANDSCAPE_PRIMARY;
   case 90:
-    return natural_portrait ? blink::WebScreenOrientationLandscapePrimary
-                           : blink::WebScreenOrientationPortraitSecondary;
+    return natural_portrait ? SCREEN_ORIENTATION_VALUES_LANDSCAPE_PRIMARY
+                            : SCREEN_ORIENTATION_VALUES_PORTRAIT_SECONDARY;
   case 180:
-    return natural_portrait ? blink::WebScreenOrientationPortraitSecondary
-                           : blink::WebScreenOrientationLandscapeSecondary;
+    return natural_portrait ? SCREEN_ORIENTATION_VALUES_PORTRAIT_SECONDARY
+                            : SCREEN_ORIENTATION_VALUES_LANDSCAPE_SECONDARY;
   case 270:
-    return natural_portrait ? blink::WebScreenOrientationLandscapeSecondary
-                           : blink::WebScreenOrientationPortraitPrimary;
+    return natural_portrait ? SCREEN_ORIENTATION_VALUES_LANDSCAPE_SECONDARY
+                            : SCREEN_ORIENTATION_VALUES_PORTRAIT_PRIMARY;
   default:
     NOTREACHED();
-    return blink::WebScreenOrientationPortraitPrimary;
+    return SCREEN_ORIENTATION_VALUES_PORTRAIT_PRIMARY;
   }
 }
 
 // static
-blink::WebScreenOrientationType
-RenderWidgetHostViewBase::GetOrientationTypeForDesktop(
+ScreenOrientationValues RenderWidgetHostViewBase::GetOrientationTypeForDesktop(
     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;
 
   if (!is_portrait && primary_landscape_angle == -1)
     primary_landscape_angle = angle;
 
   if (is_portrait) {
     return primary_portrait_angle == angle
-        ? blink::WebScreenOrientationPortraitPrimary
-        : blink::WebScreenOrientationPortraitSecondary;
+        ? SCREEN_ORIENTATION_VALUES_PORTRAIT_PRIMARY
+        : SCREEN_ORIENTATION_VALUES_PORTRAIT_SECONDARY;
   }
 
   return primary_landscape_angle == angle
-      ? blink::WebScreenOrientationLandscapePrimary
-      : blink::WebScreenOrientationLandscapeSecondary;
+      ? SCREEN_ORIENTATION_VALUES_LANDSCAPE_PRIMARY
+      : SCREEN_ORIENTATION_VALUES_LANDSCAPE_SECONDARY;
 }
 
 void RenderWidgetHostViewBase::OnDidNavigateMainFrameToNewPage() {
 }
 
 uint32_t RenderWidgetHostViewBase::GetSurfaceClientId() {
   return 0;
 }
 
 uint32_t RenderWidgetHostViewBase::SurfaceClientIdAtPoint(
@@ skipping 87 matching lines @@
 
 bool RenderWidgetHostViewBase::IsChildFrameForTesting() const {
   return false;
 }
 
 cc::SurfaceId RenderWidgetHostViewBase::SurfaceIdForTesting() const {
   return cc::SurfaceId();
 }
 
 }  // namespace content