Fixes and test updates for aura-mus

ui/views/mus/desktop_window_tree_host_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/desktop_window_tree_host_mus.h"
 
 #include "base/memory/ptr_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/client/focus_client.h"
@@ skipping 107 matching lines @@
   window()->SetProperty(aura::client::kRestoreBoundsKey,
                         new gfx::Rect(restored_bounds));
   ShowWindowWithState(ui::SHOW_STATE_MAXIMIZED);
 }
 
 bool DesktopWindowTreeHostMus::IsVisible() const {
   return window()->IsVisible();
 }
 
 void DesktopWindowTreeHostMus::SetSize(const gfx::Size& size) {
-  window()->SetBounds(gfx::Rect(window()->bounds().origin(), size));
+  // TODO: handle device scale, http://crbug.com/663524.
+  SetBounds(gfx::Rect(window()->bounds().origin(), size));
 }
 
 void DesktopWindowTreeHostMus::StackAbove(aura::Window* window) {
   NOTIMPLEMENTED();
 }
 
 void DesktopWindowTreeHostMus::StackAtTop() {
   NOTIMPLEMENTED();
 }
 
 void DesktopWindowTreeHostMus::CenterWindow(const gfx::Size& size) {
   NOTIMPLEMENTED();
 }
+
 void DesktopWindowTreeHostMus::GetWindowPlacement(
     gfx::Rect* bounds,
     ui::WindowShowState* show_state) const {
-  NOTIMPLEMENTED();
+  // Implementation matches that of NativeWidgetAura.
+  *bounds = GetRestoredBounds();
+  *show_state = window()->GetProperty(aura::client::kShowStateKey);
 }
+
 gfx::Rect DesktopWindowTreeHostMus::GetWindowBoundsInScreen() const {
-  // TODO: convert to dips.
+  // TODO: convert to dips, http://crbug.com/663524.
   return GetBounds();
 }
 
 gfx::Rect DesktopWindowTreeHostMus::GetClientAreaBoundsInScreen() const {
   // View-to-screen coordinate system transformations depend on this returning
   // the full window bounds, for example View::ConvertPointToScreen().
   return GetWindowBoundsInScreen();
 }
 
 gfx::Rect DesktopWindowTreeHostMus::GetRestoredBounds() const {
@@ skipping 200 matching lines @@
 void DesktopWindowTreeHostMus::SizeConstraintsChanged() {
   Widget* widget = native_widget_delegate_->AsWidget();
   window()->SetProperty(aura::client::kCanMaximizeKey,
                         widget->widget_delegate()->CanMaximize());
   window()->SetProperty(aura::client::kCanMinimizeKey,
                         widget->widget_delegate()->CanMinimize());
   window()->SetProperty(aura::client::kCanResizeKey,
                         widget->widget_delegate()->CanResize());
 }
 
+void DesktopWindowTreeHostMus::ShowImpl() {
+  native_widget_delegate_->OnNativeWidgetVisibilityChanging(true);
+  // Using ui::SHOW_STATE_NORMAL matches that of DesktopWindowTreeHostX11.
+  ShowWindowWithState(ui::SHOW_STATE_NORMAL);
+  WindowTreeHostMus::ShowImpl();
+  native_widget_delegate_->OnNativeWidgetVisibilityChanged(true);
+}
+
+void DesktopWindowTreeHostMus::HideImpl() {
+  native_widget_delegate_->OnNativeWidgetVisibilityChanging(false);
+  WindowTreeHostMus::HideImpl();
+  native_widget_delegate_->OnNativeWidgetVisibilityChanged(false);
+}
+
+void DesktopWindowTreeHostMus::SetBounds(const gfx::Rect& bounds_in_pixels) {
+  // TODO: handle conversion to dips, http://crbug.com/663524.
+  gfx::Rect final_bounds_in_pixels = bounds_in_pixels;
+  if (GetBounds().size() != bounds_in_pixels.size()) {
+    gfx::Size size = bounds_in_pixels.size();
+    size.SetToMax(native_widget_delegate_->GetMinimumSize());
+    const gfx::Size max_size = native_widget_delegate_->GetMaximumSize();
+    if (!max_size.IsEmpty())
+      size.SetToMin(max_size);
+    final_bounds_in_pixels.set_size(size);
+  }
+  WindowTreeHostPlatform::SetBounds(final_bounds_in_pixels);
+}
+
 void DesktopWindowTreeHostMus::OnWindowInitialized(aura::Window* window) {}
 
 void DesktopWindowTreeHostMus::OnActiveFocusClientChanged(
     aura::client::FocusClient* focus_client,
     aura::Window* window) {
   if (window == this->window()) {
     is_active_ = true;
     desktop_native_widget_aura_->HandleActivationChanged(true);
   } else if (is_active_) {
     is_active_ = false;
     desktop_native_widget_aura_->HandleActivationChanged(false);
   }
 }
 
 }  // namespace views