views: Some more layer change, and add/update some tests for layers.

ui/aura/window_unittest.cc

 // Copyright (c) 2011 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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/aura_test_base.h"
 #include "ui/aura/desktop.h"
 #include "ui/aura/event.h"
@@ skipping 524 matching lines @@
       gfx::Rect(0, 0, 500, 500), w1.get()));
   scoped_ptr<Window> w111(CreateTestWindowWithDelegate(&d111, 111,
       gfx::Rect(50, 50, 450, 450), w11.get()));
   scoped_ptr<Window> w12(CreateTestWindowWithDelegate(NULL, 12,
       gfx::Rect(0, 0, 500, 500), w1.get()));
 
   gfx::Point target_point = w111->bounds().CenterPoint();
   EXPECT_EQ(w111.get(), w1->GetEventHandlerForPoint(target_point));
 }
 
+class VisibilityWindowDelegate : public TestWindowDelegate {
+ public:
+  VisibilityWindowDelegate()
+      : shown_(0),
+        hidden_(0) {
+  }
+
+  int shown() const { return shown_; }
+  int hidden() const { return hidden_; }
+  void Clear() {
+    shown_ = 0;
+    hidden_ = 0;
+  }
+
+  virtual void OnWindowVisibilityChanged(bool visible) OVERRIDE {
+    if (visible)
+      shown_++;
+    else
+      hidden_++;
+  }
+
+ private:
+  int shown_;
+  int hidden_;
+
+  DISALLOW_COPY_AND_ASSIGN(VisibilityWindowDelegate);
+};
+
 // Verifies show/hide propagate correctly to children and the layer.
 TEST_F(WindowTest, Visibility) {
-  scoped_ptr<Window> w1(CreateTestWindowWithId(1, NULL));
+  VisibilityWindowDelegate d;
+  scoped_ptr<Window> w1(CreateTestWindowWithDelegate(&d, 1, gfx::Rect(), NULL));
   scoped_ptr<Window> w2(CreateTestWindowWithId(2, w1.get()));
   scoped_ptr<Window> w3(CreateTestWindowWithId(3, w2.get()));
 
   // Create shows all the windows.
   EXPECT_TRUE(w1->IsVisible());
   EXPECT_TRUE(w2->IsVisible());
   EXPECT_TRUE(w3->IsVisible());
+  EXPECT_EQ(1, d.shown());
 
+  d.Clear();
   w1->Hide();
   EXPECT_FALSE(w1->IsVisible());
   EXPECT_FALSE(w2->IsVisible());
   EXPECT_FALSE(w3->IsVisible());
+  EXPECT_EQ(1, d.hidden());
+  EXPECT_EQ(0, d.shown());
 
   w2->Show();
   EXPECT_FALSE(w1->IsVisible());
   EXPECT_FALSE(w2->IsVisible());
   EXPECT_FALSE(w3->IsVisible());
 
   w3->Hide();
   EXPECT_FALSE(w1->IsVisible());
   EXPECT_FALSE(w2->IsVisible());
   EXPECT_FALSE(w3->IsVisible());
 
+  d.Clear();
   w1->Show();
   EXPECT_TRUE(w1->IsVisible());
   EXPECT_TRUE(w2->IsVisible());
   EXPECT_FALSE(w3->IsVisible());
+  EXPECT_EQ(0, d.hidden());
+  EXPECT_EQ(1, d.shown());
 
   w3->Show();
   EXPECT_TRUE(w1->IsVisible());
   EXPECT_TRUE(w2->IsVisible());
   EXPECT_TRUE(w3->IsVisible());
 }
 
 // When set_consume_events() is called with |true| for a Window, that Window
 // should make sure that none behind it in the z-order see events if it has
 // children. If it does not have children, event targeting works as usual.
@@ skipping 133 matching lines @@
 
   // Deactivate w1 and make sure w2 becomes active and frontmost.
   w1->Deactivate();
   EXPECT_FALSE(w1->IsActive());
   EXPECT_TRUE(w2->IsActive());
   EXPECT_EQ(w2.get(), parent->children()[1]);
 }
 
 }  // namespace internal
 }  // namespace aura