Moves transient window observer methods out of WindowObserver

ui/views/corewm/transient_window_manager_unittest.cc

 // Copyright 2014 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/corewm/transient_window_manager.h"
 
 #include "ui/aura/client/visibility_client.h"
 #include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
+#include "ui/views/corewm/transient_window_observer.h"
 #include "ui/views/corewm/window_util.h"
 #include "ui/views/test/views_test_base.h"
 
 using aura::Window;
 
 using aura::test::ChildWindowIDsAsString;
 using aura::test::CreateTestWindowWithId;
 
 namespace views {
 namespace corewm {
 
+class TestTransientWindowObserver : public TransientWindowObserver {
+ public:
+  TestTransientWindowObserver() : add_count_(0), remove_count_(0) {
+  }
+
+  virtual ~TestTransientWindowObserver() {
+  }
+
+  int add_count() const { return add_count_; }
+  int remove_count() const { return remove_count_; }
+
+  // TransientWindowObserver overrides:
+  virtual void OnTransientChildAdded(Window* window,
+                                     Window* transient) OVERRIDE {
+    add_count_++;
+  }
+  virtual void OnTransientChildRemoved(Window* window,
+                                       Window* transient) OVERRIDE {
+    remove_count_++;
+  }
+
+ private:
+  int add_count_;
+  int remove_count_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestTransientWindowObserver);
+};
+
 class TransientWindowManagerTest : public views::ViewsTestBase {
  public:
   TransientWindowManagerTest() {}
   virtual ~TransientWindowManagerTest() {}
 
  protected:
   // Creates a transient window that is transient to |parent|.
   Window* CreateTransientChild(int id, Window* parent) {
     Window* window = new Window(NULL);
     window->set_id(id);
@@ skipping 533 matching lines @@
   EXPECT_EQ(root->children()[1], transient2.get());
   EXPECT_EQ(root->children()[2], window1.get());
   EXPECT_EQ(root->children()[3], window3.get());
   ASSERT_EQ(4u, root->layer()->children().size());
   EXPECT_EQ(root->layer()->children()[0], window2->layer());
   EXPECT_EQ(root->layer()->children()[1], transient2->layer());
   EXPECT_EQ(root->layer()->children()[2], window1->layer());
   EXPECT_EQ(root->layer()->children()[3], window3->layer());
 }
 
+// Verifies TransientWindowObserver is notified appropriately.
+TEST_F(TransientWindowManagerTest, TransientWindowObserverNotified) {
+  scoped_ptr<Window> parent(CreateTestWindowWithId(0, GetContext()));
+  scoped_ptr<Window> w1(CreateTestWindowWithId(1, parent.get()));
+
+  TestTransientWindowObserver test_observer;
+  TransientWindowManager::Get(parent.get())->AddObserver(&test_observer);
+
+  AddTransientChild(parent.get(), w1.get());
+  EXPECT_EQ(1, test_observer.add_count());
+  EXPECT_EQ(0, test_observer.remove_count());
+
+  RemoveTransientChild(parent.get(), w1.get());
+  EXPECT_EQ(1, test_observer.add_count());
+  EXPECT_EQ(1, test_observer.remove_count());
+
+  TransientWindowManager::Get(parent.get())->RemoveObserver(&test_observer);
+}
+
 }  // namespace corewm
 }  // namespace views