Change blink::WebScreenInfo to content::ScreenInfo

content/browser/web_contents/web_contents_view_mac.mm

 // 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.
 
 #import <Carbon/Carbon.h>
 
 #import "content/browser/web_contents/web_contents_view_mac.h"
 
 #include <string>
 
@@ skipping 22 matching lines @@
 #include "ui/display/screen.h"
 #include "ui/gfx/image/image_skia_util_mac.h"
 
 using blink::WebDragOperation;
 using blink::WebDragOperationsMask;
 using content::DropData;
 using content::PopupMenuHelper;
 using content::RenderViewHostFactory;
 using content::RenderWidgetHostView;
 using content::RenderWidgetHostViewMac;
+using content::ScreenInfo;
 using content::WebContents;
 using content::WebContentsImpl;
 using content::WebContentsViewMac;
 
 // Ensure that the blink::WebDragOperation enum values stay in sync with
 // NSDragOperation constants, since the code below static_casts between 'em.
 #define STATIC_ASSERT_ENUM(a, b)                            \
   static_assert(static_cast<int>(a) == static_cast<int>(b), \
                 "enum mismatch: " #a)
 STATIC_ASSERT_ENUM(NSDragOperationNone, blink::WebDragOperationNone);
@@ skipping 17 matching lines @@
 - (void)cancelDeferredClose;
 - (void)clearWebContentsView;
 - (void)closeTabAfterEvent;
 - (void)updateWebContentsVisibility;
 - (void)viewDidBecomeFirstResponder:(NSNotification*)notification;
 - (content::WebContentsImpl*)webContents;
 @end
 
 namespace {
 
-blink::WebScreenInfo GetWebScreenInfo(NSView* view) {
+content::ScreenInfo GetNSViewScreenInfo(NSView* view) {
   display::Display display =
       display::Screen::GetScreen()->GetDisplayNearestWindow(view);
 
   NSScreen* screen = [NSScreen deepestScreen];
 
-  blink::WebScreenInfo results;
+  content::ScreenInfo results;
 
-  results.deviceScaleFactor = static_cast<int>(display.device_scale_factor());
+  results.device_scale_factor = static_cast<int>(display.device_scale_factor());
   results.depth = NSBitsPerPixelFromDepth([screen depth]);
-  results.depthPerComponent = NSBitsPerSampleFromDepth([screen depth]);
-  results.isMonochrome =
+  results.depth_per_component = NSBitsPerSampleFromDepth([screen depth]);
+  results.is_monochrome =
       [[screen colorSpace] colorSpaceModel] == NSGrayColorSpaceModel;
   results.rect = display.bounds();
-  results.availableRect = display.work_area();
-  results.orientationAngle = display.RotationAsDegree();
-  results.orientationType =
+  results.available_rect = display.work_area();
+  results.orientation_angle = display.RotationAsDegree();
+  results.orientation_type =
       content::RenderWidgetHostViewBase::GetOrientationTypeForDesktop(display);
 
   return results;
 }
 
 }  // namespace
 
 namespace content {
 
 // static
-void WebContentsView::GetDefaultScreenInfo(
-    blink::WebScreenInfo* results) {
-  *results = GetWebScreenInfo(NULL);
+void WebContentsView::GetDefaultScreenInfo(ScreenInfo* results) {
+  *results = GetNSViewScreenInfo(nil);
 }
 
 WebContentsView* CreateWebContentsView(
     WebContentsImpl* web_contents,
     WebContentsViewDelegate* delegate,
     RenderViewHostDelegateView** render_view_host_delegate_view) {
   WebContentsViewMac* rv = new WebContentsViewMac(web_contents, delegate);
   *render_view_host_delegate_view = rv;
   return rv;
 }
@@ skipping 23 matching lines @@
   if (!rwhv)
     return NULL;
   return rwhv->GetNativeView();
 }
 
 gfx::NativeWindow WebContentsViewMac::GetTopLevelNativeWindow() const {
   NSWindow* window = [cocoa_view_.get() window];
   return window ? window : delegate_->GetNativeWindow();
 }
 
-void WebContentsViewMac::GetScreenInfo(blink::WebScreenInfo* results) const {
-  *results = GetWebScreenInfo(GetNativeView());
+void WebContentsViewMac::GetScreenInfo(ScreenInfo* results) const {
+  *results = GetNSViewScreenInfo(GetNativeView());
 }
 
 void WebContentsViewMac::GetContainerBounds(gfx::Rect* out) const {
   NSWindow* window = [cocoa_view_.get() window];
   NSRect bounds = [cocoa_view_.get() bounds];
   if (window)  {
     // Convert bounds to window coordinate space.
     bounds = [cocoa_view_.get() convertRect:bounds toView:nil];
 
     // Convert bounds to screen coordinate space.
@@ skipping 549 matching lines @@
 
 - (void)viewDidHide {
   [self updateWebContentsVisibility];
 }
 
 - (void)viewDidUnhide {
   [self updateWebContentsVisibility];
 }
 
 @end