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 108 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);
-  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();
+
+  if (old_work_area == display_.work_area())
+    return;
+
+  window_manager_->screen()->display_list()->UpdateDisplay(display_);
+
+  // Push new display insets to service:ui if we have a connection.
+  auto* display_controller = window_manager_->GetDisplayController();
+  if (display_controller)
+    display_controller->SetDisplayWorkArea(display_.id(),
+                                           display_.bounds().size(), insets);
+}
+
+void RootWindowController::SetDisplay(const display::Display& display) {
+  DCHECK_EQ(display.id(), display_.id());
+  display_ = display;
+  window_manager_->screen()->display_list()->UpdateDisplay(display_);
 }
 
 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