(Not ready for review!) Toolbar and views high dpi support.

ui/views/win/hwnd_message_handler.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 "ui/views/win/hwnd_message_handler.h"
 
 #include <dwmapi.h>
 #include <shellapi.h>
 
 #include "base/bind.h"
@@ skipping 436 matching lines @@
 
 void HWNDMessageHandler::CloseNow() {
   // We may already have been destroyed if the selection resulted in a tab
   // switch which will have reactivated the browser window and closed us, so
   // we need to check to see if we're still a window before trying to destroy
   // ourself.
   if (IsWindow(hwnd()))
     DestroyWindow(hwnd());
 }
 
+void ConvertToScreen(RECT* rect) {
+#if defined(ENABLE_HIDPI)
+  static float os_scale = ui::GetDPIScale();
+  rect->left *= os_scale;
+  rect->right *= os_scale;
+  rect->top *= os_scale;
+  rect->bottom *= os_scale;
+#endif
+}
+
+void ConvertToScreen(POINT* point) {
+#if defined(ENABLE_HIDPI)
+  static float os_scale = ui::GetDPIScale();
+  point->x *= os_scale;
+  point->y *= os_scale;
+#endif
+}
+
 gfx::Rect HWNDMessageHandler::GetWindowBoundsInScreen() const {
   RECT r;
   GetWindowRect(hwnd(), &r);
+  ConvertToScreen(&r);
   return gfx::Rect(r);
 }
 
 gfx::Rect HWNDMessageHandler::GetClientAreaBoundsInScreen() const {
   RECT r;
   GetClientRect(hwnd(), &r);
   POINT point = { r.left, r.top };
   ClientToScreen(hwnd(), &point);
+  ConvertToScreen(&r); // Scales right/left
+  ConvertToScreen(&point); // Scale x/y
   return gfx::Rect(point.x, point.y, r.right - r.left, r.bottom - r.top);
 }
 
 gfx::Rect HWNDMessageHandler::GetRestoredBounds() const {
   // If we're in fullscreen mode, we've changed the normal bounds to the monitor
   // rect, so return the saved bounds instead.
   if (fullscreen_handler_->fullscreen())
     return fullscreen_handler_->GetRestoreBounds();
 
   gfx::Rect bounds;
@@ skipping 556 matching lines @@
     tme.dwFlags = mouse_tracking_flags;
     tme.hwndTrack = hwnd();
     tme.dwHoverTime = 0;
     TrackMouseEvent(&tme);
   } else if (mouse_tracking_flags != active_mouse_tracking_flags_) {
     TrackMouseEvents(active_mouse_tracking_flags_ | TME_CANCEL);
     TrackMouseEvents(mouse_tracking_flags);
   }
 }
 
+ui::ScaleFactor GetScaleFactor() {
+#if defined(ENABLE_HIDPI)
+  float scale = ui::GetDPIScale();
+  if (scale > 1.6)
+    return ui::SCALE_FACTOR_180P;
+  else if (scale > 1.2)
+    return ui::SCALE_FACTOR_140P;
+#endif
+  return ui::SCALE_FACTOR_100P;
+}
+
 void HWNDMessageHandler::ClientAreaSizeChanged() {
   RECT r = {0, 0, 0, 0};
   if (delegate_->WidgetSizeIsClientSize()) {
     // TODO(beng): investigate whether this could be done
     // from other branch of if-else.
     if (!IsMinimized())
       GetClientRect(hwnd(), &r);
   } else {
     GetWindowRect(hwnd(), &r);
   }
   gfx::Size s(std::max(0, static_cast<int>(r.right - r.left)),
               std::max(0, static_cast<int>(r.bottom - r.top)));
   delegate_->HandleClientSizeChanged(s);
   if (use_layered_buffer_) {
     layered_window_contents_.reset(
-        new gfx::Canvas(s, ui::SCALE_FACTOR_100P, false));
+        new gfx::Canvas(s, GetScaleFactor(), false));
   }
 }
 
 gfx::Insets HWNDMessageHandler::GetClientAreaInsets() const {
   gfx::Insets insets;
   if (delegate_->GetClientAreaInsets(&insets))
     return insets;
   DCHECK(insets.empty());
 
   // Returning an empty Insets object causes the default handling in
@@ skipping 388 matching lines @@
   // TODO(beng): resolve this with the GetWindowLong() check on the subsequent
   //             line.
   if (delegate_->IsWidgetWindow())
     return delegate_->CanActivate() ? MA_ACTIVATE : MA_NOACTIVATEANDEAT;
   if (GetWindowLong(hwnd(), GWL_EXSTYLE) & WS_EX_NOACTIVATE)
     return MA_NOACTIVATE;
   SetMsgHandled(FALSE);
   return MA_ACTIVATE;
 }
 
+void ScaleScreenPoint(CPoint* point) {
+  static float dpi_scale = ui::GetDPIScale();
+  point->SetPoint( point->x * dpi_scale, point->y * dpi_scale);
+}
+
+void ScaleScreenPoint(POINT* point) {
+  static float dpi_scale = ui::GetDPIScale();
+  point->x *= dpi_scale;
+  point->y *= dpi_scale;
+}
+
 LRESULT HWNDMessageHandler::OnMouseRange(UINT message,
                                          WPARAM w_param,
                                          LPARAM l_param) {
 #if defined(USE_AURA)
   // We handle touch events on Windows Aura. Ignore synthesized mouse messages
   // from Windows.
   if (!touch_ids_.empty() || ui::IsMouseEventFromTouch(message))
     return 0;
 #endif
   if (message == WM_RBUTTONUP && is_right_mouse_pressed_on_caption_) {
     is_right_mouse_pressed_on_caption_ = false;
     ReleaseCapture();
     // |point| is in window coordinates, but WM_NCHITTEST and TrackPopupMenu()
     // expect screen coordinates.
     CPoint screen_point(l_param);
+    ScaleScreenPoint(&screen_point);
     MapWindowPoints(hwnd(), HWND_DESKTOP, &screen_point, 1);
     w_param = SendMessage(hwnd(), WM_NCHITTEST, 0,
                           MAKELPARAM(screen_point.x, screen_point.y));
     if (w_param == HTCAPTION || w_param == HTSYSMENU) {
       ui::ShowSystemMenu(hwnd(), screen_point.x, screen_point.y);
       return 0;
     }
   } else if (message == WM_NCLBUTTONDOWN && delegate_->IsUsingCustomFrame()) {
     switch (w_param) {
       case HTCLOSE:
@@ skipping 20 matching lines @@
       (w_param == HTCAPTION || w_param == HTSYSMENU)) {
     is_right_mouse_pressed_on_caption_ = true;
     // We SetCapture() to ensure we only show the menu when the button
     // down and up are both on the caption. Note: this causes the button up to
     // be WM_RBUTTONUP instead of WM_NCRBUTTONUP.
     SetCapture();
   }
 
   MSG msg = { hwnd(), message, w_param, l_param, GetMessageTime(),
               { GET_X_LPARAM(l_param), GET_Y_LPARAM(l_param) } };
+  //ScaleScreenPoint(&msg.pt);
   ui::MouseEvent event(msg);
   if (!touch_ids_.empty() || ui::IsMouseEventFromTouch(message))
     event.set_flags(event.flags() | ui::EF_FROM_TOUCH);
 
   if (!(event.flags() & ui::EF_IS_NON_CLIENT))
     delegate_->HandleTooltipMouseMove(message, w_param, l_param);
 
   if (event.type() == ui::ET_MOUSE_MOVED && !HasCapture()) {
     // Windows only fires WM_MOUSELEAVE events if the application begins
     // "tracking" mouse events for a given HWND during WM_MOUSEMOVE events.
@@ skipping 585 matching lines @@
     DwmExtendFrameIntoClientArea(hwnd(), &m);
   }
   if (window_pos->flags & SWP_SHOWWINDOW)
     delegate_->HandleVisibilityChanged(true);
   else if (window_pos->flags & SWP_HIDEWINDOW)
     delegate_->HandleVisibilityChanged(false);
   SetMsgHandled(FALSE);
 }
 
 }  // namespace views