Adds OnChildWindowVisibilityChanged to ui::WindowObserver

services/ui/public/cpp/tests/window_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 "services/ui/public/cpp/window.h"
 
 #include <limits.h>
 #include <stdint.h>
 
 #include "base/logging.h"
@@ skipping 128 matching lines @@
 }
 
 namespace {
 MUS_DEFINE_WINDOW_PROPERTY_KEY(int, kIntKey, -2);
 MUS_DEFINE_WINDOW_PROPERTY_KEY(const char*, kStringKey, "squeamish");
 }
 
 TEST_F(WindowTest, Property) {
   TestWindow w;
 
-  // Non-existent properties should return the default walues.
+  // Non-existent properties should return the default values.
   EXPECT_EQ(-2, w.GetLocalProperty(kIntKey));
   EXPECT_EQ(std::string("squeamish"), w.GetLocalProperty(kStringKey));
 
-  // A set property walue should be returned again (even if it's the default
-  // walue).
+  // A set property value should be returned again (even if it's the default
+  // value).
   w.SetLocalProperty(kIntKey, INT_MAX);
   EXPECT_EQ(INT_MAX, w.GetLocalProperty(kIntKey));
   w.SetLocalProperty(kIntKey, -2);
   EXPECT_EQ(-2, w.GetLocalProperty(kIntKey));
   w.SetLocalProperty(kIntKey, INT_MIN);
   EXPECT_EQ(INT_MIN, w.GetLocalProperty(kIntKey));
 
   w.SetLocalProperty(kStringKey, static_cast<const char*>(NULL));
   EXPECT_EQ(NULL, w.GetLocalProperty(kStringKey));
   w.SetLocalProperty(kStringKey, "squeamish");
   EXPECT_EQ(std::string("squeamish"), w.GetLocalProperty(kStringKey));
   w.SetLocalProperty(kStringKey, "ossifrage");
   EXPECT_EQ(std::string("ossifrage"), w.GetLocalProperty(kStringKey));
 
-  // ClearProperty should restore the default walue.
+  // ClearProperty should restore the default value.
   w.ClearLocalProperty(kIntKey);
   EXPECT_EQ(-2, w.GetLocalProperty(kIntKey));
   w.ClearLocalProperty(kStringKey);
   EXPECT_EQ(std::string("squeamish"), w.GetLocalProperty(kStringKey));
 }
 
 namespace {
 
 class TestProperty {
  public:
@@ skipping 492 matching lines @@
   ~VisibilityChangeObserver() override { window_->RemoveObserver(this); }
 
   Changes GetAndClearChanges() {
     Changes changes;
     changes.swap(changes_);
     return changes;
   }
 
  private:
   // Overridden from WindowObserver:
-  void OnWindowVisibilityChanging(Window* window) override {
-    changes_.push_back(base::StringPrintf(
-        "window=%d phase=changing wisibility=%s", window->local_id(),
-        window->visible() ? "true" : "false"));
+  void OnWindowVisibilityChanging(Window* window, bool visible) override {
+    changes_.push_back(
+        base::StringPrintf("window=%d phase=changing visibility=%s",
+                           window->local_id(), visible ? "true" : "false"));
   }
-  void OnWindowVisibilityChanged(Window* window) override {
-    changes_.push_back(base::StringPrintf(
-        "window=%d phase=changed wisibility=%s", window->local_id(),
-        window->visible() ? "true" : "false"));
+  void OnChildWindowVisibilityChanged(Window* window, bool visible) override {
+    changes_.push_back(
+        base::StringPrintf("window=%d phase=child-changed visibility=%s",
+                           window->local_id(), visible ? "true" : "false"));
+  }
+  void OnWindowVisibilityChanged(Window* window, bool visible) override {
+    changes_.push_back(
+        base::StringPrintf("window=%d phase=changed visibility=%s",
+                           window->local_id(), visible ? "true" : "false"));
   }
 
   Window* window_;
   Changes changes_;
 
   DISALLOW_COPY_AND_ASSIGN(VisibilityChangeObserver);
 };
 
 }  // namespace
 
 TEST_F(WindowObserverTest, SetVisible) {
   TestWindow w1;
   EXPECT_FALSE(w1.visible());
   w1.set_local_id(1);
   w1.SetVisible(true);
   EXPECT_TRUE(w1.visible());
   {
-    // Change wisibility from true to false and make sure we get notifications.
+    // Change visibility from true to false and make sure we get notifications.
     VisibilityChangeObserver observer(&w1);
     w1.SetVisible(false);
 
     Changes changes = observer.GetAndClearChanges();
     ASSERT_EQ(2U, changes.size());
-    EXPECT_EQ("window=1 phase=changing wisibility=true", changes[0]);
-    EXPECT_EQ("window=1 phase=changed wisibility=false", changes[1]);
+    EXPECT_EQ("window=1 phase=changing visibility=false", changes[0]);
+    EXPECT_EQ("window=1 phase=changed visibility=false", changes[1]);
   }
   {
-    // Set visible to existing walue and werify no notifications.
+    // Set visible to existing value and verify no notifications.
     VisibilityChangeObserver observer(&w1);
     w1.SetVisible(false);
     EXPECT_TRUE(observer.GetAndClearChanges().empty());
   }
 }
 
 TEST_F(WindowObserverTest, SetVisibleParent) {
   TestWindow parent;
   parent.SetVisible(true);
   parent.set_local_id(1);
   TestWindow child;
   child.SetVisible(true);
   child.set_local_id(2);
   parent.AddChild(&child);
   EXPECT_TRUE(parent.visible());
   EXPECT_TRUE(child.visible());
   {
-    // Change wisibility from true to false and make sure we get notifications
+    // Change visibility from true to false and make sure we get notifications
     // on the parent.
     VisibilityChangeObserver observer(&parent);
     child.SetVisible(false);
 
     Changes changes = observer.GetAndClearChanges();
-    ASSERT_EQ(1U, changes.size());
-    EXPECT_EQ("window=2 phase=changed wisibility=false", changes[0]);
+    ASSERT_EQ(2U, changes.size());
+    EXPECT_EQ("window=2 phase=child-changed visibility=false", changes[0]);
+    EXPECT_EQ("window=2 phase=changed visibility=false", changes[1]);
   }
 }
 
 TEST_F(WindowObserverTest, SetVisibleChild) {
   TestWindow parent;
   parent.SetVisible(true);
   parent.set_local_id(1);
   TestWindow child;
   child.SetVisible(true);
   child.set_local_id(2);
   parent.AddChild(&child);
   EXPECT_TRUE(parent.visible());
   EXPECT_TRUE(child.visible());
   {
-    // Change wisibility from true to false and make sure we get notifications
+    // Change visibility from true to false and make sure we get notifications
     // on the child.
     VisibilityChangeObserver observer(&child);
     parent.SetVisible(false);
 
     Changes changes = observer.GetAndClearChanges();
     ASSERT_EQ(1U, changes.size());
-    EXPECT_EQ("window=1 phase=changed wisibility=false", changes[0]);
+    EXPECT_EQ("window=1 phase=changed visibility=false", changes[0]);
   }
 }
 
 namespace {
 
 class OpacityChangeObserver : public WindowObserver {
  public:
   explicit OpacityChangeObserver(Window* window) : window_(window) {
     window_->AddObserver(this);
   }
@@ skipping 474 matching lines @@
   EXPECT_EQ(0, observer.removed_count());
   observer.ResetCounts();
 
   child.reset();
   EXPECT_EQ(0, observer.added_count());
   EXPECT_EQ(1, observer.removed_count());
   observer.ResetCounts();
 }
 
 }  // namespace ui