Move Show and Hide impls from PlatformWindowMus to NativeWidgetMus

ui/views/mus/native_widget_mus.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 "ui/views/mus/native_widget_mus.h"
 
 #include "base/macros.h"
 #include "base/thread_task_runner_handle.h"
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "components/mus/public/cpp/window.h"
@@ skipping 693 matching lines @@
       return window_->GetSharedProperty<gfx::Rect>(kRestoreBounds_Property);
   }
   return GetWindowBoundsInScreen();
 }
 
 std::string NativeWidgetMus::GetWorkspace() const {
   return std::string();
 }
 
 void NativeWidgetMus::SetBounds(const gfx::Rect& bounds) {
-  if (!window_tree_host_)
+  if (!(window_ && window_tree_host_))
     return;
 
   gfx::Size size(bounds.size());
   const gfx::Size min_size = GetMinimumSize();
   const gfx::Size max_size = GetMaximumSize();
   if (!max_size.IsEmpty())
     size.SetToMin(max_size);
   size.SetToMax(min_size);
   window_tree_host_->SetBounds(gfx::Rect(bounds.origin(), size));
+  window_->SetBounds(gfx::Rect(bounds.origin(), size));
 }
 
 void NativeWidgetMus::SetSize(const gfx::Size& size) {
   if (!window_tree_host_)
     return;
 
   gfx::Rect bounds = window_tree_host_->GetBounds();
   SetBounds(gfx::Rect(bounds.origin(), size));
 }
 
@@ skipping 30 matching lines @@
 
 void NativeWidgetMus::Show() {
   ShowWithWindowState(ui::SHOW_STATE_NORMAL);
 }
 
 void NativeWidgetMus::Hide() {
   if (!window_tree_host_)
     return;
 
   window_tree_host_->Hide();
+  window_->SetVisible(false);
   GetNativeWindow()->Hide();
 }
 
 void NativeWidgetMus::ShowMaximizedWithBounds(
     const gfx::Rect& restored_bounds) {
   // NOTIMPLEMENTED();
 }
 
 void NativeWidgetMus::ShowWithWindowState(ui::WindowShowState state) {
-  if (!window_tree_host_)
+  if (!(window_ && window_tree_host_))
     return;
 
   window_tree_host_->Show();
+  window_->SetVisible(true);
   GetNativeWindow()->Show();
   if (native_widget_delegate_->CanActivate()) {
     if (state != ui::SHOW_STATE_INACTIVE)
       Activate();
     GetWidget()->SetInitialFocus(state);
   }
 }
 
 bool NativeWidgetMus::IsVisible() const {
   // TODO(beng): this should probably be wired thru PlatformWindow.
   return window_ && window_->visible();
 }
 
 void NativeWidgetMus::Activate() {
-  if (window_tree_host_)
-    window_tree_host_->platform_window()->Activate();
+  if (window_)
+    window_->SetFocus();
 }
 
 void NativeWidgetMus::Deactivate() {
   if (IsActive())
     window_->connection()->ClearFocus();
 }
 
 bool NativeWidgetMus::IsActive() const {
   mus::Window* focused =
       window_ ? window_->connection()->GetFocusedWindow() : nullptr;
@@ skipping 301 matching lines @@
   GetWidget()->Close();
 }
 
 void NativeWidgetMus::OnMusWindowVisibilityChanging(mus::Window* window) {
   native_widget_delegate_->OnNativeWidgetVisibilityChanging(!window->visible());
 }
 
 void NativeWidgetMus::OnMusWindowVisibilityChanged(mus::Window* window) {
   if (window->visible()) {
     window_tree_host_->Show();
+    window_->SetVisible(true);
     GetNativeWindow()->Show();
   } else {
     window_tree_host_->Hide();
+    window_->SetVisible(false);
     GetNativeWindow()->Hide();
   }
   native_widget_delegate_->OnNativeWidgetVisibilityChanged(window->visible());
 }
 
 }  // namespace views