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..58eae4cb4febbf23941c20a6e47d808a91a240b0
--- /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 {
+ public:
+  ScreenWinDisplay();
+  explicit ScreenWinDisplay(const DisplayInfo& display_info);
+
+  const Display& display() const;

[oshima, 2016/01/30 00:10:33]

inline them. (or GetDisplay()/GetPhysicalBounds()) if you really want not to
inline them)

[robliao, 2016/01/30 01:23:52]

These are simple accessors and have to be named display() and physical_bounds()
per
https://www.chromium.org/developers/coding-style

However, they shouldn't be inlined since they aren't light weight per
https://www.chromium.org/developers/coding-style/cpp-dos-and-donts#TOC-Stop-i...

Having said that, it appears the inlining guidance is advisory instead of
required, so if you're okay inlining these, so be it. I've updated the
display_info as well for consistency.

Done.

+  const Rect& physical_bounds() const;
+
+ private:
+  const gfx::Display display_;
+  const gfx::Rect pixel_bounds_;
+};
+
+}  // namespace win
+}  // namespace gfx
+
+#endif  // UI_GFX_WIN_SCREEN_WIN_DISPLAY_H_