Update Chromium to branch 1650 (31.0.1650.63)

Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>

1 files changed, 63 insertions, 0 deletions

diff --git a/chromium/ui/gfx/win/dpi.h b/chromium/ui/gfx/win/dpi.h
new file mode 100644
index 00000000000..a056f532661
--- /dev/null
+++ b/chromium/ui/gfx/win/dpi.h
@@ -0,0 +1,63 @@
+// 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.
+
+#ifndef UI_GFX_DPI_WIN_H_
+#define UI_GFX_DPI_WIN_H_
+
+#include "ui/gfx/gfx_export.h"
+#include "ui/gfx/point.h"
+#include "ui/gfx/rect.h"
+#include "ui/gfx/size.h"
+
+namespace gfx {
+
+UI_EXPORT Size GetDPI();
+
+// Gets the scale factor of the display. For example, if the display DPI is
+// 96 then the scale factor is 1.0.
+UI_EXPORT float GetDPIScale();
+
+UI_EXPORT bool IsInHighDPIMode();
+
+UI_EXPORT void EnableHighDPISupport();
+
+// TODO(kevers|girard):  Move above methods into win namespace.
+
+namespace win {
+
+UI_EXPORT float GetDeviceScaleFactor();
+
+UI_EXPORT Point ScreenToDIPPoint(const Point& pixel_point);
+
+UI_EXPORT Point DIPToScreenPoint(const Point& dip_point);
+
+UI_EXPORT Rect ScreenToDIPRect(const Rect& pixel_bounds);
+
+UI_EXPORT Rect DIPToScreenRect(const Rect& dip_bounds);
+
+UI_EXPORT Size ScreenToDIPSize(const Size& size_in_pixels);
+
+UI_EXPORT Size DIPToScreenSize(const Size& dip_size);
+
+// Win32's GetSystemMetrics uses pixel measures. This function calls
+// GetSystemMetrics for the given |metric|, then converts the result to DIP.
+UI_EXPORT int GetSystemMetricsInDIP(int metric);
+
+// Sometimes the OS secretly scales apps that are not DPIAware. This is not
+// visible through standard OS calls like GetWindowPos(), or through
+// GetDPIScale().
+// Returns the scale factor of the display, where 96 DPI is 1.0.
+// (Avoid this function... use GetDPIScale() instead.)
+// TODO(girard): Remove this once DPIAware is enabled - http://crbug.com/149881
+UI_EXPORT double GetUndocumentedDPIScale();
+
+// Win7 and Win8 send touch events scaled according to the current DPI
+// scaling. Win8.1 corrects this, and sends touch events in DPI units.
+// This function returns the appropriate scaling factor for touch events.
+UI_EXPORT double GetUndocumentedDPITouchScale();
+
+}  // namespace win
+}  // namespace gfx
+
+#endif  // UI_GFX_DPI_WIN_H_