1 files changed, 6 insertions, 3 deletions
diff --git a/ui/aura/window.cc b/ui/aura/window.cc
index f907c9a..3706b34 100644
--- a/ui/aura/window.cc
+++ b/ui/aura/window.cc
@@ -578,10 +578,13 @@ void Window::SetVisible(bool visible) {
 
   bool was_visible = IsVisible();
   if (visible != layer_->visible()) {
-    if (client::GetVisibilityClient())
-      client::GetVisibilityClient()->UpdateLayerVisibility(this, visible);
-    else
+    RootWindow* root_window = GetRootWindow();
+    if (client::GetVisibilityClient(root_window)) {
+      client::GetVisibilityClient(root_window)->UpdateLayerVisibility(
+          this, visible);
+    } else {
       layer_->SetVisible(visible);
+    }
   }
   visible_ = visible;
   bool is_visible = IsVisible();