Initial cut of ash/wm/common classes for mus

mash/wm/window_layout.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 "mash/wm/window_layout.h"
 
 #include <stdint.h>
 
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_property.h"
 #include "mash/wm/property_util.h"
 
 namespace mash {
 namespace wm {
 
 WindowLayout::WindowLayout(mus::Window* owner) : LayoutManager(owner) {
   AddLayoutProperty(mus::mojom::WindowManager::kPreferredSize_Property);
   AddLayoutProperty(mus::mojom::WindowManager::kShowState_Property);
 }
 WindowLayout::~WindowLayout() {}
 
 void WindowLayout::LayoutWindow(mus::Window* window) {
   mus::mojom::ShowState show_state = GetWindowShowState(window);
   gfx::Rect user_set_bounds = GetWindowUserSetBounds(window);
   gfx::Size preferred_size = GetWindowPreferredSize(window);
 
   // Maximized/fullscreen/presentation windows should be sized to the bounds

[James Cook, 2016/05/06 19:46:47]

nit: presentation doesn't exist now

[sky, 2016/05/06 22:12:57]

Done.

   // of the container.
   // If a window has bounds set by the user, those should be respected as long
   // as they meet certain constraints (e.g. visible).
   // TODO(beng): transient windows:
   // Top level non-transient windows with no bounds but a preferred size should
   // opened centered within the work area.
   // Transient windows should be opened centered within their parent.
 
   switch (show_state) {
     case mus::mojom::ShowState::MAXIMIZED:
-    case mus::mojom::ShowState::IMMERSIVE:
-    case mus::mojom::ShowState::PRESENTATION:
+    case mus::mojom::ShowState::FULLSCREEN:
       FitToContainer(window);
       break;
-    case mus::mojom::ShowState::RESTORED: {
+    case mus::mojom::ShowState::DOCKED:
+    case mus::mojom::ShowState::INACTIVE:
+    case mus::mojom::ShowState::DEFAULT:
+    case mus::mojom::ShowState::NORMAL: {

[James Cook, 2016/05/06 19:46:47]

nit: order these either alphabetically, or in the order in the enum definition

[sky, 2016/05/06 22:12:57]

Done.

       if (!user_set_bounds.IsEmpty()) {
         // If the bounds are unchanged, this will do nothing.
         window->SetBounds(user_set_bounds);
       } else if (!preferred_size.IsEmpty()) {
         CenterWindow(window, preferred_size);

[James Cook, 2016/05/06 19:46:47]

Do we want to center docked windows? Or will they always have user set bounds?
Maybe fit to container?

[sky, 2016/05/06 22:12:57]

This code won't end up being used for docked windows, or at least it shouldn't.

I'll likely keep this class around in the short term, but I'm a bit troubled by
having the two layout types. I may nuke this.

       }
     }
     case mus::mojom::ShowState::MINIMIZED:
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
@@ skipping 20 matching lines @@
                                 const gfx::Size& preferred_size) {
   const gfx::Rect bounds(
       (owner()->bounds().width() - preferred_size.width()) / 2,
       (owner()->bounds().height() - preferred_size.height()) / 2,
       preferred_size.width(), preferred_size.height());
   window->SetBounds(bounds);
 }
 
 }  // namespace wm
 }  // namespace mash