ScreenWin Testability and Restructuring

ui/gfx/win/screen_win_display.h

Index: ui/gfx/win/screen_win_display.h
diff --git a/ui/gfx/win/screen_win_display.h b/ui/gfx/win/screen_win_display.h
new file mode 100644
index 0000000000000000000000000000000000000000..07278c3bb13863c5aead9970050e949e5dd0b1f8
--- /dev/null
+++ b/ui/gfx/win/screen_win_display.h
@@ -0,0 +1,36 @@
+// Copyright 2016 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.
+
+#ifndef UI_GFX_WIN_SCREEN_WIN_DISPLAY_H_
+#define UI_GFX_WIN_SCREEN_WIN_DISPLAY_H_
+
+#include <windows.h>
+
+#include "ui/gfx/display.h"
+#include "ui/gfx/geometry/rect.h"
+
+namespace gfx {
+namespace win {
+
+class DisplayInfo;
+
+// A display used by gfx::ScreenWin.
+// It holds a display and additional parameters used for DPI calculations.
+class ScreenWinDisplay final {
+ public:
+  ScreenWinDisplay();
+  explicit ScreenWinDisplay(const DisplayInfo& display_info);
+
+  const gfx::Display& display() const { return display_; }
+  const gfx::Rect& pixel_bounds() const { return pixel_bounds_; }
+
+ private:
+  gfx::Display display_;
+  gfx::Rect pixel_bounds_;
+};
+
+}  // namespace win
+}  // namespace gfx
+
+#endif  // UI_GFX_WIN_SCREEN_WIN_DISPLAY_H_