Adds couple of functions to WindowManagerDelegate:

ui/aura/mus/window_tree_client.cc

 // Copyright 2014 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_client.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 127 matching lines @@
   // TODO(riajiang): Change to use display::GetDisplayWithDisplayId() after
   // https://codereview.chromium.org/2361283002/ is landed.
   return display::Screen::GetScreen()
       ->GetDisplayNearestWindow(window)
       .device_scale_factor();
 }
 
 }  // namespace
 
 WindowTreeClient::WindowTreeClient(
+    service_manager::Connector* connector,
     WindowTreeClientDelegate* delegate,
     WindowManagerDelegate* window_manager_delegate,
     mojo::InterfaceRequest<ui::mojom::WindowTreeClient> request)
-    : client_id_(0),
+    : connector_(connector),
+      client_id_(0),
       next_window_id_(1),
       next_change_id_(1),
       delegate_(delegate),
       window_manager_delegate_(window_manager_delegate),
       binding_(this),
       tree_(nullptr),
       in_destructor_(false),
       weak_factory_(this) {
   // Allow for a null request in tests.
   if (request.is_pending())
@@ skipping 30 matching lines @@
     delete tracker.windows().front();
 
   for (WindowTreeClientObserver& observer : observers_)
     observer.OnDidDestroyClient(this);
 
   capture_synchronizer_.reset();
 
   client::GetTransientWindowClient()->RemoveObserver(this);
 }
 
-void WindowTreeClient::ConnectViaWindowTreeFactory(
-    service_manager::Connector* connector) {
+void WindowTreeClient::ConnectViaWindowTreeFactory() {
   // The client id doesn't really matter, we use 101 purely for debugging.
   client_id_ = 101;
 
   ui::mojom::WindowTreeFactoryPtr factory;
-  connector->ConnectToInterface(ui::mojom::kServiceName, &factory);
+  connector_->ConnectToInterface(ui::mojom::kServiceName, &factory);
   ui::mojom::WindowTreePtr window_tree;
   factory->CreateWindowTree(GetProxy(&window_tree),
                             binding_.CreateInterfacePtrAndBind());
   SetWindowTree(std::move(window_tree));
 }
 
-void WindowTreeClient::ConnectAsWindowManager(
-    service_manager::Connector* connector) {
+void WindowTreeClient::ConnectAsWindowManager() {
   DCHECK(window_manager_delegate_);
 
   ui::mojom::WindowManagerWindowTreeFactoryPtr factory;
-  connector->ConnectToInterface(ui::mojom::kServiceName, &factory);
+  connector_->ConnectToInterface(ui::mojom::kServiceName, &factory);
   ui::mojom::WindowTreePtr window_tree;
   factory->CreateWindowTree(GetProxy(&window_tree),
                             binding_.CreateInterfacePtrAndBind());
   SetWindowTree(std::move(window_tree));
 }
 
 client::CaptureClient* WindowTreeClient::GetCaptureClient() {
   return delegate_->GetCaptureClient();
 }
 
@@ skipping 28 matching lines @@
 
 void WindowTreeClient::Embed(
     Id window_id,
     ui::mojom::WindowTreeClientPtr client,
     uint32_t flags,
     const ui::mojom::WindowTree::EmbedCallback& callback) {
   DCHECK(tree_);
   tree_->Embed(window_id, std::move(client), flags, callback);
 }
 
-void WindowTreeClient::RequestClose(Window* window) {
-  DCHECK(window);
-  if (window_manager_internal_client_)
-    window_manager_internal_client_->WmRequestClose(
-        WindowMus::Get(window)->server_id());
-}
-
 void WindowTreeClient::AttachCompositorFrameSink(
     Id window_id,
     ui::mojom::CompositorFrameSinkType type,
     cc::mojom::MojoCompositorFrameSinkRequest compositor_frame_sink,
     cc::mojom::MojoCompositorFrameSinkClientPtr client) {
   DCHECK(tree_);
   tree_->AttachCompositorFrameSink(
       window_id, type, std::move(compositor_frame_sink), std::move(client));
 }
 
 void WindowTreeClient::RegisterWindowMus(WindowMus* window) {
   DCHECK(windows_.find(window->server_id()) == windows_.end());
   windows_[window->server_id()] = window;
 }
 
 WindowMus* WindowTreeClient::GetWindowByServerId(Id id) {
   IdToWindowMap::const_iterator it = windows_.find(id);
   return it != windows_.end() ? it->second : nullptr;
 }
 
-bool WindowTreeClient::WasCreatedByThisClient(const WindowMus* window) const {
-  // Windows created via CreateTopLevelWindow() are not owned by us, but have
-  // our client id. const_cast is required by set.
-  return HiWord(window->server_id()) == client_id_ &&
-         roots_.count(const_cast<WindowMus*>(window)) == 0;
-}
-
 InFlightChange* WindowTreeClient::GetOldestInFlightChangeMatching(
     const InFlightChange& change) {
   for (const auto& pair : in_flight_map_) {
     if (pair.second->window() == change.window() &&
         pair.second->change_type() == change.change_type() &&
         pair.second->Matches(change)) {
       return pair.second.get();
     }
   }
   return nullptr;
@@ skipping 156 matching lines @@
 
   delegate_->OnEmbed(std::move(window_tree_host));
 }
 
 WindowTreeHost* WindowTreeClient::WmNewDisplayAddedImpl(
     const display::Display& display,
     ui::mojom::WindowDataPtr root_data,
     bool parent_drawn) {
   DCHECK(window_manager_delegate_);
 
+  window_manager_delegate_->OnWmWillCreateDisplay(display);
+
   std::unique_ptr<WindowTreeHostMus> window_tree_host =
       CreateWindowTreeHost(WindowMusType::DISPLAY, root_data, display.id());
 
   WindowTreeHost* window_tree_host_ptr = window_tree_host.get();
   window_manager_delegate_->OnWmNewDisplay(std::move(window_tree_host),
                                            display);
   return window_tree_host_ptr;
 }
 
 std::unique_ptr<EventResultCallback>
@@ skipping 237 matching lines @@
   }
 }
 
 std::set<Window*> WindowTreeClient::GetRoots() {
   std::set<Window*> roots;
   for (WindowMus* window : roots_)
     roots.insert(window->GetWindow());
   return roots;
 }
 
+bool WindowTreeClient::WasCreatedByThisClient(const WindowMus* window) const {
+  // Windows created via CreateTopLevelWindow() are not owned by us, but have
+  // our client id. const_cast is required by set.
+  return HiWord(window->server_id()) == client_id_ &&
+         roots_.count(const_cast<WindowMus*>(window)) == 0;
+}
+
 gfx::Point WindowTreeClient::GetCursorScreenPoint() {
   // We raced initialization. Return (0, 0).
   if (!cursor_location_memory())
     return gfx::Point();
 
   base::subtle::Atomic32 location =
       base::subtle::NoBarrier_Load(cursor_location_memory());
   return gfx::Point(static_cast<int16_t>(location >> 16),
                     static_cast<int16_t>(location & 0xFFFF));
 }
@@ skipping 179 matching lines @@
   if (ApplyServerChangeToExistingInFlightChange(new_change))
     return;
 
   SetWindowBoundsFromServer(window, new_bounds);
 }
 
 void WindowTreeClient::OnClientAreaChanged(
     uint32_t window_id,
     const gfx::Insets& new_client_area,
     const std::vector<gfx::Rect>& new_additional_client_areas) {
-  // TODO: client area.
-  // TODO(riajiang): Convert from pixel to DIP. (http://crbug.com/600815)
-  /*
-  Window* window = GetWindowByServerId(window_id);
-  if (window) {
-    WindowPrivate(window).LocalSetClientArea(
-        new_client_area,
-        new_additional_client_areas);
+  WindowMus* window = GetWindowByServerId(window_id);
+  if (!window)
+    return;
+
+  float device_scale_factor = ScaleFactorForDisplay(window->GetWindow());
+  std::vector<gfx::Rect> new_additional_client_areas_in_dip;
+  for (const gfx::Rect& area : new_additional_client_areas) {
+    new_additional_client_areas_in_dip.push_back(
+        gfx::ConvertRectToDIP(device_scale_factor, area));
   }
-  */
+  window_manager_delegate_->OnWmSetClientArea(
+      window->GetWindow(),
+      gfx::ConvertInsetsToDIP(device_scale_factor, new_client_area),
+      new_additional_client_areas_in_dip);
 }
 
 void WindowTreeClient::OnTransientWindowAdded(uint32_t window_id,
                                               uint32_t transient_window_id) {
   WindowMus* window = GetWindowByServerId(window_id);
   WindowMus* transient_window = GetWindowByServerId(transient_window_id);
   // window or transient_window or both may be null if a local delete occurs
   // with an in flight add from the server.
   if (window && transient_window)
     window->AddTransientChildFromServer(transient_window);
@@ skipping 508 matching lines @@
     const gfx::Insets& hit_area) {
   if (window_manager_internal_client_) {
     // TODO(riajiang): Figure out if |offset| needs to be converted.
     // (http://crbugs.com/646932)
     window_manager_internal_client_->SetUnderlaySurfaceOffsetAndExtendedHitArea(
         WindowMus::Get(window)->server_id(), offset.x(), offset.y(),
         gfx::ConvertInsetsToDIP(ScaleFactorForDisplay(window), hit_area));
   }
 }
 
+void WindowTreeClient::RequestClose(Window* window) {
+  DCHECK(window);
+  if (window_manager_internal_client_)
+    window_manager_internal_client_->WmRequestClose(
+        WindowMus::Get(window)->server_id());
+}
+
 void WindowTreeClient::OnWindowTreeHostBoundsWillChange(
     WindowTreeHostMus* window_tree_host,
     const gfx::Rect& bounds) {
   ScheduleInFlightBoundsChange(WindowMus::Get(window_tree_host->window()),
                                window_tree_host->GetBoundsInPixels(), bounds);
 }
 
 void WindowTreeClient::OnWindowTreeHostClientAreaWillChange(
     WindowTreeHostMus* window_tree_host,
     const gfx::Insets& client_area,
@@ skipping 100 matching lines @@
   return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>(
       this, capture_synchronizer_.get(), window));
 }
 
 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) {
   return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>(
       this, focus_synchronizer_.get(), window));
 }
 
 }  // namespace aura