Refactor Windows DPI Point, Rect, and Size for Multiple Monitor DPI Awareness

content/child/npapi/webplugin_delegate_impl_win.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/child/npapi/webplugin_delegate_impl.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 13 matching lines @@
 #include "content/child/npapi/plugin_instance.h"
 #include "content/child/npapi/plugin_lib.h"
 #include "content/child/npapi/plugin_stream_url.h"
 #include "content/child/npapi/webplugin.h"
 #include "content/child/npapi/webplugin_ime_win.h"
 #include "content/common/cursors/webcursor.h"
 #include "content/common/plugin_constants_win.h"
 #include "content/public/common/content_constants.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
-#include "ui/gfx/win/dpi.h"
+#include "ui/gfx/screen_win.h"
 #include "ui/gfx/win/hwnd_util.h"
 
 using blink::WebKeyboardEvent;
 using blink::WebInputEvent;
 using blink::WebMouseEvent;
 
 namespace content {
 
 namespace {
 
@@ skipping 707 matching lines @@
 }
 
 bool WebPluginDelegateImpl::WindowedReposition(
     const gfx::Rect& window_rect_in_dip,
     const gfx::Rect& clip_rect_in_dip) {
   if (!windowed_handle_) {
     NOTREACHED();
     return false;
   }
 
-  gfx::Rect window_rect = gfx::win::DIPToScreenRect(window_rect_in_dip);
-  gfx::Rect clip_rect = gfx::win::DIPToScreenRect(clip_rect_in_dip);
+  gfx::Rect window_rect = gfx::ScreenWin::DIPToScreenRect(windowed_handle_,
+                                                          window_rect_in_dip);
+  gfx::Rect clip_rect = gfx::ScreenWin::DIPToScreenRect(windowed_handle_,
+                                                        clip_rect_in_dip);
   if (window_rect_ == window_rect && clip_rect_ == clip_rect)
     return false;
 
   // We only set the plugin's size here.  Its position is moved elsewhere, which
   // allows the window moves/scrolling/clipping to be synchronized with the page
   // and other windows.
   // If the plugin window has no parent, then don't focus it because it isn't
   // being displayed anywhere. See:
   // http://code.google.com/p/chromium/issues/detail?id=32658
   if (window_rect.size() != window_rect_.size()) {
@@ skipping 709 matching lines @@
     case WM_RBUTTONUP:
       ::ReleaseCapture();
       break;
 
     default:
       break;
   }
 }
 
 }  // namespace content