Minor fixes for WidgetRemovalsObserver::OnWillRemoveView

ui/views/widget/widget_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 <algorithm>
 #include <set>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 11 matching lines @@
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/test/test_views.h"
 #include "ui/views/test/test_widget_observer.h"
 #include "ui/views/test/widget_test.h"
 #include "ui/views/widget/native_widget_delegate.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget_deletion_observer.h"
+#include "ui/views/widget/widget_removals_observer.h"
 #include "ui/views/window/dialog_delegate.h"
 #include "ui/views/window/native_frame_view.h"
 
 #if defined(OS_WIN)
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/view_prop.h"
 #include "ui/base/win/window_event_target.h"
 #include "ui/views/win/hwnd_util.h"
 #endif
@@ skipping 3395 matching lines @@
   // about the initial scale factor. Fake it.
   view->OnDeviceScaleFactorChanged(scale_factor);
   EXPECT_EQ(scale_factor, view->last_scale_factor());
 
   // Changes should be propagated.
   scale_factor *= 2.0f;
   widget->GetLayer()->OnDeviceScaleFactorChanged(scale_factor);
   EXPECT_EQ(scale_factor, view->last_scale_factor());
 }
 
+namespace {
+
+class TestWidgetRemovalsObserver : public WidgetRemovalsObserver {
+ public:
+  TestWidgetRemovalsObserver() {}
+  ~TestWidgetRemovalsObserver() override {}
+
+  void OnWillRemoveView(Widget* widget, View* view) override {
+    removed_views_.insert(view);
+  }
+
+  bool DidRemoveView(View* view) {
+    return removed_views_.find(view) != removed_views_.end();
+  }
+
+ private:
+  std::set<View*> removed_views_;
+};
+
+}
+
+// Test that WidgetRemovalsObserver::OnWillRemoveView is called when deleting
+// a view.
+TEST_F(WidgetTest, WidgetRemovalsObserverCalled) {
+  WidgetAutoclosePtr widget(CreateTopLevelPlatformWidget());
+  TestWidgetRemovalsObserver removals_observer;
+  widget->AddRemovalsObserver(&removals_observer);
+
+  View* parent = new View();
+  widget->client_view()->AddChildView(parent);
+
+  View* child = new View();
+  parent->AddChildView(child);
+
+  widget->client_view()->RemoveChildView(parent);
+  EXPECT_TRUE(removals_observer.DidRemoveView(parent));
+  EXPECT_FALSE(removals_observer.DidRemoveView(child));
+
+  widget->RemoveRemovalsObserver(&removals_observer);
+}
+
+// Test that WidgetRemovalsObserver::OnWillRemoveView is called when moving
+// a view from one widget to another, but not when moving a view within
+// the same widget.
+TEST_F(WidgetTest, WidgetRemovalsObserverCalledWhenMovingBetweenWidgets) {
+  WidgetAutoclosePtr widget(CreateTopLevelPlatformWidget());
+  TestWidgetRemovalsObserver removals_observer;
+  widget->AddRemovalsObserver(&removals_observer);
+
+  View* parent = new View();
+  widget->client_view()->AddChildView(parent);
+
+  View* child = new View();
+  widget->client_view()->AddChildView(child);
+
+  // Reparenting the child shouldn't call the removals observer.
+  parent->AddChildView(child);
+  EXPECT_FALSE(removals_observer.DidRemoveView(child));
+
+  // Moving the child to a different widget should call the removals observer.
+  WidgetAutoclosePtr widget2(CreateTopLevelPlatformWidget());
+  widget2->client_view()->AddChildView(child);
+  EXPECT_TRUE(removals_observer.DidRemoveView(child));
+
+  widget->RemoveRemovalsObserver(&removals_observer);
+}
+
 }  // namespace test
 }  // namespace views