Handle modified displays in mustash.

ash/mus/root_window_controller.cc

 // Copyright 2016 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 "ash/mus/root_window_controller.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <map>
@@ skipping 20 matching lines @@
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "mojo/public/cpp/bindings/type_converter.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/ui/common/switches.h"
 #include "services/ui/common/util.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "services/ui/public/cpp/window.h"
 #include "services/ui/public/cpp/window_property.h"
 #include "services/ui/public/cpp/window_tree_client.h"
+#include "services/ui/public/interfaces/display/display_controller.mojom.h"
 #include "ui/display/display_list.h"
 #include "ui/display/screen_base.h"
 
 namespace ash {
 namespace mus {
 
 RootWindowController::RootWindowController(WindowManager* window_manager,
                                            ui::Window* root,
                                            const display::Display& display)
     : window_manager_(window_manager),
@@ skipping 68 matching lines @@
 
   return window;
 }
 
 WmWindowMus* RootWindowController::GetWindowByShellWindowId(int id) {
   return WmWindowMus::AsWmWindowMus(
       WmWindowMus::Get(root_)->GetChildByShellWindowId(id));
 }
 
 void RootWindowController::SetWorkAreaInests(const gfx::Insets& insets) {
+  gfx::Rect old_work_area = display_.work_area();
   display_.UpdateWorkAreaFromInsets(insets);
+
+  if (old_work_area == display_.work_area())
+    return;
+
   display::DisplayList* display_list =
       window_manager_->screen()->display_list();
-  auto iter = display_list->FindDisplayById(display_.id());
-  DCHECK(iter != display_list->displays().end());
-  const display::DisplayList::Type display_type =
-      iter == display_list->GetPrimaryDisplayIterator()
-          ? display::DisplayList::Type::PRIMARY
-          : display::DisplayList::Type::NOT_PRIMARY;
-  display_list->UpdateDisplay(display_, display_type);
-  // TODO(kylechar): needs to push to DisplayController.
-  NOTIMPLEMENTED();
+  display_list->UpdateDisplay(display_);
+
+  // Push new display insets to service:ui.
+  display::mojom::DisplayControllerPtr display_controller;

[sky, 2016/10/19 23:37:59]

Can you make WindowManager maintain a single connection to display_controller.
Otherwise we may end up with subtle ordering issues when a bunch of stuff
changes.

[kylechar, 2016/10/20 15:04:19]

Done.

+  GetConnector()->ConnectToInterface("service:ui", &display_controller);
+  display_controller->SetDisplayWorkArea(display_.id(),
+                                         display_.bounds().size(), insets);
 }
 
 gfx::Rect RootWindowController::CalculateDefaultBounds(
     ui::Window* window) const {
   if (window->HasSharedProperty(
           ui::mojom::WindowManager::kInitialBounds_Property)) {
     return window->GetSharedProperty<gfx::Rect>(
         ui::mojom::WindowManager::kInitialBounds_Property);
   }
 
@@ skipping 19 matching lines @@
 void RootWindowController::CreateLayoutManagers() {
   // Override the default layout managers for certain containers.
   WmWindowMus* lock_screen_container =
       GetWindowByShellWindowId(kShellWindowId_LockScreenContainer);
   layout_managers_[lock_screen_container->mus_window()].reset(
       new ScreenlockLayout(lock_screen_container->mus_window()));
 }
 
 }  // namespace mus
 }  // namespace ash