Renames WindowManagerConfig to FrameDecorationValues and moves to Display

ui/views/mus/screen_mus.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 "ui/views/mus/screen_mus.h"
 
+// #include "components/mus/public/interfaces/window_manager_constants.mojom.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/shell/public/cpp/application_connection.h"
 #include "mojo/shell/public/cpp/application_impl.h"
 #include "ui/gfx/display_finder.h"
 #include "ui/gfx/display_observer.h"
+#include "ui/views/mus/screen_mus_delegate.h"
+#include "ui/views/mus/window_manager_frame_values.h"
 
 namespace mojo {
 
 template <>
 struct TypeConverter<gfx::Display, mus::mojom::DisplayPtr> {
   static gfx::Display Convert(const mus::mojom::DisplayPtr& input) {
     gfx::Display result(input->id, input->bounds.To<gfx::Rect>());
     result.set_work_area(input->work_area.To<gfx::Rect>());
     result.set_device_scale_factor(input->device_pixel_ratio);
     switch (input->rotation) {
@@ skipping 18 matching lines @@
         result.set_touch_support(gfx::Display::TOUCH_SUPPORT_AVAILABLE);
         break;
       case mus::mojom::TouchSupport::UNAVAILABLE:
         result.set_touch_support(gfx::Display::TOUCH_SUPPORT_UNAVAILABLE);
         break;
     }
     return result;
   }
 };
 
+template <>
+struct TypeConverter<views::WindowManagerFrameValues,
+                     mus::mojom::FrameDecorationValuesPtr> {
+  static views::WindowManagerFrameValues Convert(
+      const mus::mojom::FrameDecorationValuesPtr& input) {
+    views::WindowManagerFrameValues result;
+    result.normal_insets = input->normal_client_area_insets.To<gfx::Insets>();
+    result.maximized_insets =
+        input->maximized_client_area_insets.To<gfx::Insets>();
+    result.max_title_bar_button_width = input->max_title_bar_button_width;
+    return result;
+  }
+};
+
 }  // namespace mojo
 
 namespace views {
 
-ScreenMus::ScreenMus()
-    : primary_display_index_(0), display_manager_observer_binding_(this) {}
+ScreenMus::ScreenMus(ScreenMusDelegate* delegate)
+    : delegate_(delegate),
+      primary_display_index_(0),
+      display_manager_observer_binding_(this) {}
 
 ScreenMus::~ScreenMus() {}
 
 void ScreenMus::Init(mojo::ApplicationImpl* app) {
   gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, this);
 
   app->ConnectToService("mojo:mus", &display_manager_);
 
   display_manager_->AddObserver(
       display_manager_observer_binding_.CreateInterfacePtrAndBind());
@@ skipping 103 matching lines @@
 void ScreenMus::RemoveObserver(gfx::DisplayObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void ScreenMus::OnDisplays(mojo::Array<mus::mojom::DisplayPtr> displays) {
   // This should only be called once from Init() before any observers have been
   // added.
   DCHECK(displays_.empty());
   displays_ = displays.To<std::vector<gfx::Display>>();
   for (size_t i = 0; i < displays.size(); ++i) {
-    if (displays[i]->is_primary)
+    if (displays[i]->is_primary) {
       primary_display_index_ = static_cast<int>(i);
+      // TODO(sky): Make WindowManagerFrameValues per display.
+      WindowManagerFrameValues frame_values =
+          displays[i]->frame_decoration_values.To<WindowManagerFrameValues>();
+      WindowManagerFrameValues::SetInstance(frame_values);
+    }
   }
 }
 
 void ScreenMus::OnDisplaysChanged(
     mojo::Array<mus::mojom::DisplayPtr> transport_displays) {
   for (size_t i = 0; i < transport_displays.size(); ++i) {
     const bool is_primary = transport_displays[i]->is_primary;
     ProcessDisplayChanged(transport_displays[i].To<gfx::Display>(), is_primary);
+    if (is_primary) {
+      WindowManagerFrameValues frame_values =
+          transport_displays[i]
+              ->frame_decoration_values.To<WindowManagerFrameValues>();
+      WindowManagerFrameValues::SetInstance(frame_values);
+      delegate_->OnWindowManagerFrameValuesChanged();
+    }
   }
 }
 
 void ScreenMus::OnDisplayRemoved(int64_t id) {
   const int index = FindDisplayIndexById(id);
   DCHECK_NE(-1, index);
   // Another display must become primary before the existing primary is
   // removed.
   DCHECK_NE(index, primary_display_index_);
   const gfx::Display display = displays_[index];
   FOR_EACH_OBSERVER(gfx::DisplayObserver, observers_,
                     OnDisplayRemoved(display));
 }
 
 }  // namespace views