Scale bounds in aura-mus client-lib and NativeWidgetMus in hdpi mode.

ui/aura/mus/window_tree_host_mus.cc

 // Copyright 2015 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/aura/mus/window_tree_host_mus.h"
 
 #include "base/memory/ptr_util.h"
 #include "ui/aura/env.h"
 #include "ui/aura/mus/input_method_mus.h"
 #include "ui/aura/mus/window_port_mus.h"
@@ skipping 47 matching lines @@
 // window and fit in the smallest sizeof(AcceleratedWidget) uint32_t
 // has this property.
 #if defined(OS_WIN) || defined(OS_ANDROID)
     accelerated_widget =
         reinterpret_cast<gfx::AcceleratedWidget>(accelerated_widget_count++);
 #else
     accelerated_widget =
         static_cast<gfx::AcceleratedWidget>(accelerated_widget_count++);
 #endif
   }
-  // TODO(markdittmer): Use correct device-scale-factor from |window|.
-  OnAcceleratedWidgetAvailable(accelerated_widget, 1.f);
+  OnAcceleratedWidgetAvailable(accelerated_widget,
+                               GetDisplay().device_scale_factor());
 
   delegate_->OnWindowTreeHostCreated(this);
 
   SetPlatformWindow(base::MakeUnique<ui::StubWindow>(
       this,
       false));  // Do not advertise accelerated widget; already set manually.
 
   input_method_ = base::MakeUnique<InputMethodMus>(this, window());
   input_method_->Init(window_tree_client->connector());
   SetSharedInputMethod(input_method_.get());
@@ skipping 16 matching lines @@
               ->CreateWindowPortForTopLevel(properties),
           window_tree_client,
           display::Screen::GetScreen()->GetPrimaryDisplay().id(),
           properties) {}
 
 WindowTreeHostMus::~WindowTreeHostMus() {
   DestroyCompositor();
   DestroyDispatcher();
 }
 
-void WindowTreeHostMus::SetBoundsFromServer(const gfx::Rect& bounds) {
+void WindowTreeHostMus::SetBoundsFromServer(const gfx::Rect& bounds_in_pixels) {
   base::AutoReset<bool> resetter(&in_set_bounds_from_server_, true);
-  SetBoundsInPixels(bounds);
+  SetBoundsInPixels(bounds_in_pixels);
 }
 
 void WindowTreeHostMus::SetClientArea(
     const gfx::Insets& insets,
     const std::vector<gfx::Rect>& additional_client_area) {
   delegate_->OnWindowTreeHostClientAreaWillChange(this, insets,
                                                   additional_client_area);
 }
 
 void WindowTreeHostMus::SetHitTestMask(const base::Optional<gfx::Rect>& rect) {
   delegate_->OnWindowTreeHostHitTestMaskWillChange(this, rect);
 }
 
 display::Display WindowTreeHostMus::GetDisplay() const {
-  for (const display::Display& display :
-       display::Screen::GetScreen()->GetAllDisplays()) {
-    if (display.id() == display_id_)
-      return display;
-  }
-  return display::Display();
+  display::Display display;
+  display::Screen::GetScreen()->GetDisplayWithDisplayId(display_id_, &display);
+  return display;
 }
 
 void WindowTreeHostMus::HideImpl() {
   WindowTreeHostPlatform::HideImpl();
   window()->Hide();
 }
 
 void WindowTreeHostMus::SetBoundsInPixels(const gfx::Rect& bounds) {
   if (!in_set_bounds_from_server_)
     delegate_->OnWindowTreeHostBoundsWillChange(this, bounds);
@@ skipping 19 matching lines @@
 void WindowTreeHostMus::OnCloseRequest() {
   OnHostCloseRequested();
 }
 
 gfx::ICCProfile WindowTreeHostMus::GetICCProfileForCurrentDisplay() {
   // TODO: This should read the profile from mus. crbug.com/647510
   return gfx::ICCProfile();
 }
 
 }  // namespace aura