Corrects NativeWidgetAura state model to not minimize on every restore

ui/views/widget/native_widget_aura_unittest.cc

 // Copyright (c) 2012 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/widget/native_widget_aura.h"
 
 #include <memory>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/env.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/window.h"
+#include "ui/aura/window_observer.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/test/widget_test.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/wm/core/base_focus_rules.h"
 #include "ui/wm/core/default_activation_client.h"
@@ skipping 53 matching lines @@
  private:
   std::unique_ptr<wm::FocusController> focus_controller_;
   TestFocusRules* test_focus_rules_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeWidgetAuraTest);
 };
 
 TEST_F(NativeWidgetAuraTest, CenterWindowLargeParent) {
   // Make a parent window larger than the host represented by
   // WindowEventDispatcher.
-  std::unique_ptr<aura::Window> parent(new aura::Window(NULL));
+  std::unique_ptr<aura::Window> parent(new aura::Window(nullptr));
   parent->Init(ui::LAYER_NOT_DRAWN);
   parent->SetBounds(gfx::Rect(0, 0, 1024, 800));
   std::unique_ptr<Widget> widget(new Widget());
   NativeWidgetAura* window = Init(parent.get(), widget.get());
 
   window->CenterWindow(gfx::Size(100, 100));
   EXPECT_EQ(gfx::Rect( (640 - 100) / 2,
                        (480 - 100) / 2,
                        100, 100),
             window->GetNativeWindow()->bounds());
   widget->CloseNow();
 }
 
 TEST_F(NativeWidgetAuraTest, CenterWindowSmallParent) {
   // Make a parent window smaller than the host represented by
   // WindowEventDispatcher.
-  std::unique_ptr<aura::Window> parent(new aura::Window(NULL));
+  std::unique_ptr<aura::Window> parent(new aura::Window(nullptr));
   parent->Init(ui::LAYER_NOT_DRAWN);
   parent->SetBounds(gfx::Rect(0, 0, 480, 320));
   std::unique_ptr<Widget> widget(new Widget());
   NativeWidgetAura* window = Init(parent.get(), widget.get());
 
   window->CenterWindow(gfx::Size(100, 100));
   EXPECT_EQ(gfx::Rect( (480 - 100) / 2,
                        (320 - 100) / 2,
                        100, 100),
             window->GetNativeWindow()->bounds());
   widget->CloseNow();
 }
 
 // Verifies CenterWindow() constrains to parent size.
 TEST_F(NativeWidgetAuraTest, CenterWindowSmallParentNotAtOrigin) {
   // Make a parent window smaller than the host represented by
   // WindowEventDispatcher and offset it slightly from the origin.
-  std::unique_ptr<aura::Window> parent(new aura::Window(NULL));
+  std::unique_ptr<aura::Window> parent(new aura::Window(nullptr));
   parent->Init(ui::LAYER_NOT_DRAWN);
   parent->SetBounds(gfx::Rect(20, 40, 480, 320));
   std::unique_ptr<Widget> widget(new Widget());
   NativeWidgetAura* window = Init(parent.get(), widget.get());
   window->CenterWindow(gfx::Size(500, 600));
 
   // |window| should be no bigger than |parent|.
   EXPECT_EQ("20,40 480x320", window->GetNativeWindow()->bounds().ToString());
   widget->CloseNow();
 }
 
 TEST_F(NativeWidgetAuraTest, CreateMinimized) {
   Widget::InitParams params(Widget::InitParams::TYPE_WINDOW);
   params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
-  params.parent = NULL;
+  params.parent = nullptr;
   params.context = root_window();
   params.show_state = ui::SHOW_STATE_MINIMIZED;
   params.bounds.SetRect(0, 0, 1024, 800);
   std::unique_ptr<Widget> widget(new Widget());
   widget->Init(params);
   widget->Show();
 
   EXPECT_TRUE(widget->IsMinimized());
   widget->CloseNow();
 }
 
+// A WindowObserver that counts kShowStateKey property changes.
+class TestWindowObserver : public aura::WindowObserver {
+ public:
+  explicit TestWindowObserver(gfx::NativeWindow window) : window_(window) {
+    window_->AddObserver(this);
+  }
+  ~TestWindowObserver() override {
+    window_->RemoveObserver(this);
+  }
+
+  // aura::WindowObserver:
+  void OnWindowPropertyChanged(aura::Window* window,
+                               const void* key,
+                               intptr_t old) override {
+    if (key != aura::client::kShowStateKey)
+      return;
+    count_++;
+    state_ = window_->GetProperty(aura::client::kShowStateKey);
+  }
+
+  int count() const { return count_; }
+  ui::WindowShowState state() const { return state_; }
+  void Reset() { count_ = 0; }
+
+ private:
+  gfx::NativeWindow window_;
+  int count_ = 0;
+  ui::WindowShowState state_ = ui::WindowShowState::SHOW_STATE_DEFAULT;
+
+ DISALLOW_COPY_AND_ASSIGN(TestWindowObserver);
+};
+
+// Tests that window transitions from normal to minimized and back do not
+// involve extra show state transitions.
+TEST_F(NativeWidgetAuraTest, ToggleState) {
+  Widget::InitParams params(Widget::InitParams::TYPE_WINDOW);
+  params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
+  params.parent = nullptr;
+  params.context = root_window();
+  params.show_state = ui::SHOW_STATE_NORMAL;
+  params.bounds.SetRect(0, 0, 1024, 800);
+  Widget widget;
+  widget.Init(params);
+  std::unique_ptr<TestWindowObserver> observer(
+      new TestWindowObserver(widget.GetNativeWindow()));
+  widget.Show();
+  EXPECT_FALSE(widget.IsMinimized());
+  EXPECT_EQ(0, observer->count());
+  EXPECT_EQ(ui::WindowShowState::SHOW_STATE_DEFAULT, observer->state());
+
+  widget.Minimize();
+  EXPECT_TRUE(widget.IsMinimized());
+  EXPECT_EQ(1, observer->count());
+  EXPECT_EQ(ui::WindowShowState::SHOW_STATE_MINIMIZED, observer->state());
+  observer->Reset();
+
+  widget.Show();
+  widget.Restore();
+  EXPECT_EQ(1, observer->count());
+  EXPECT_EQ(ui::WindowShowState::SHOW_STATE_NORMAL, observer->state());
+
+  observer.reset();
+  EXPECT_FALSE(widget.IsMinimized());
+  widget.CloseNow();
+}
+
 class TestLayoutManagerBase : public aura::LayoutManager {
  public:
   TestLayoutManagerBase() {}
   ~TestLayoutManagerBase() override {}
 
   // aura::LayoutManager:
   void OnWindowResized() override {}
   void OnWindowAddedToLayout(aura::Window* child) override {}
   void OnWillRemoveWindowFromLayout(aura::Window* child) override {}
   void OnWindowRemovedFromLayout(aura::Window* child) override {}
@@ skipping 53 matching lines @@
 // Verifies the size of the widget doesn't change more than once during Init if
 // the window ends up maximized. This is important as otherwise
 // RenderWidgetHostViewAura ends up getting resized during construction, which
 // leads to noticable flashes.
 TEST_F(NativeWidgetAuraTest, ShowMaximizedDoesntBounceAround) {
   root_window()->SetBounds(gfx::Rect(0, 0, 640, 480));
   root_window()->SetLayoutManager(new MaximizeLayoutManager);
   std::unique_ptr<TestWidget> widget(new TestWidget());
   Widget::InitParams params(Widget::InitParams::TYPE_WINDOW);
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
-  params.parent = NULL;
+  params.parent = nullptr;
   params.context = root_window();
   params.show_state = ui::SHOW_STATE_MAXIMIZED;
   params.bounds = gfx::Rect(10, 10, 100, 200);
   widget->Init(params);
   EXPECT_FALSE(widget->did_size_change_more_than_once());
   widget->CloseNow();
 }
 
 class PropertyTestLayoutManager : public TestLayoutManagerBase {
  public:
@@ skipping 37 matching lines @@
 // Verifies that the kCanMaximizeKey/kCanMinimizeKey/kCanResizeKey have the
 // correct value when added to the layout manager.
 TEST_F(NativeWidgetAuraTest, TestPropertiesWhenAddedToLayout) {
   root_window()->SetBounds(gfx::Rect(0, 0, 640, 480));
   PropertyTestLayoutManager* layout_manager = new PropertyTestLayoutManager();
   root_window()->SetLayoutManager(layout_manager);
   std::unique_ptr<TestWidget> widget(new TestWidget());
   Widget::InitParams params(Widget::InitParams::TYPE_WINDOW);
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.delegate = new PropertyTestWidgetDelegate(widget.get());
-  params.parent = NULL;
+  params.parent = nullptr;
   params.context = root_window();
   widget->Init(params);
   EXPECT_TRUE(layout_manager->added());
   widget->CloseNow();
 }
 
 TEST_F(NativeWidgetAuraTest, GetClientAreaScreenBounds) {
   // Create a widget.
   Widget::InitParams params(Widget::InitParams::TYPE_WINDOW);
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
@@ skipping 137 matching lines @@
   EXPECT_EQ(parent->GetNativeWindow(),
             parent->GetNativeWindow()->GetEventHandlerForPoint(
                 gfx::Point(20, 20)));
 
   // Point is over |child|, it should get the event.
   EXPECT_EQ(child->GetNativeWindow(),
             parent->GetNativeWindow()->GetEventHandlerForPoint(
                 gfx::Point(70, 70)));
 
   delete view_with_layer;
-  view_with_layer = NULL;
+  view_with_layer = nullptr;
 
   EXPECT_EQ(child->GetNativeWindow(),
             parent->GetNativeWindow()->GetEventHandlerForPoint(
                 gfx::Point(20, 20)));
 
   // Work around for bug in NativeWidgetAura.
   // TODO: fix bug and remove this.
   parent->Close();
 }
 
@@ skipping 11 matching lines @@
   EXPECT_TRUE(window->GetProperty(aura::client::kDrawAttentionKey));
   widget->FlashFrame(false);
   EXPECT_FALSE(window->GetProperty(aura::client::kDrawAttentionKey));
   widget->FlashFrame(true);
   EXPECT_TRUE(window->GetProperty(aura::client::kDrawAttentionKey));
   widget->Activate();
   EXPECT_FALSE(window->GetProperty(aura::client::kDrawAttentionKey));
 }
 
 TEST_F(NativeWidgetAuraTest, NoCrashOnThemeAfterClose) {
-  std::unique_ptr<aura::Window> parent(new aura::Window(NULL));
+  std::unique_ptr<aura::Window> parent(new aura::Window(nullptr));
   parent->Init(ui::LAYER_NOT_DRAWN);
   parent->SetBounds(gfx::Rect(0, 0, 480, 320));
   std::unique_ptr<Widget> widget(new Widget());
   Init(parent.get(), widget.get());
   widget->Show();
   widget->Close();
   base::MessageLoop::current()->RunUntilIdle();
   widget->GetNativeTheme();  // Shouldn't crash.
 }
 
@@ skipping 45 matching lines @@
   EXPECT_FALSE(delegate.view()->HasFocus());
 
   test_focus_rules()->set_can_activate(true);
   views::test::TestInitialFocusWidgetDelegate delegate2(root_window());
   delegate2.GetWidget()->Show();
   EXPECT_TRUE(delegate2.view()->HasFocus());
 }
 
 }  // namespace
 }  // namespace views