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

ui/views/controls/native/native_view_host.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/controls/native/native_view_host.h"
 
 #include "base/logging.h"
+#include "ui/base/win/dpi.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/controls/native/native_view_host_wrapper.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
 // static
 const char NativeViewHost::kViewClassName[] = "views/NativeViewHost";
 
 #if defined(USE_AURA)
@@ skipping 74 matching lines @@
       native_wrapper_->UninstallClip();
     }
   }
 
   if (visible) {
     // Since widgets know nothing about the View hierarchy (they are direct
     // children of the Widget that hosts our View hierarchy) they need to be
     // positioned in the coordinate system of the Widget, not the current
     // view.  Also, they should be positioned respecting the border insets
     // of the native view.
-    gfx::Rect local_bounds = ConvertRectToWidget(GetContentsBounds());
+    gfx::Rect contents_bounds = GetContentsBounds();
+#if defined(ENABLE_HIDPI)
+    // TODO: This code probably needs to be copied into the fast_resize handler, above.
+    static float dpi_scale = ui::GetDPIScale();
+    contents_bounds.SetRect(dpi_scale * contents_bounds.x(),
+      dpi_scale * contents_bounds.y(), dpi_scale * contents_bounds.width(),
+      dpi_scale * contents_bounds.height());
+#endif
+    gfx::Rect local_bounds = ConvertRectToWidget(contents_bounds);
     native_wrapper_->ShowWidget(local_bounds.x(), local_bounds.y(),
                                 local_bounds.width(),
                                 local_bounds.height());
   } else {
     native_wrapper_->HideWidget();
   }
   fast_resize_at_last_layout_ = visible && fast_resize_;
 }
 
 void NativeViewHost::OnPaint(gfx::Canvas* canvas) {
@@ skipping 86 matching lines @@
   Widget::GetAllChildWidgets(native_view(), &widgets);
   for (Widget::Widgets::iterator i = widgets.begin(); i != widgets.end(); ++i) {
     focus_manager->ViewRemoved((*i)->GetRootView());
     if (!focus_manager->GetFocusedView())
       return;
   }
 }
 
 
 }  // namespace views