Moves management of transients out of Window

chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc

 // Copyright 2013 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 "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"
 
 #include "apps/shell_window.h"
 #include "apps/shell_window_registry.h"
 #include "ash/ash_switches.h"
 #include "ash/multi_profile_uma.h"
@@ skipping 18 matching lines @@
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "content/public/browser/notification_service.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/events/event.h"
+#include "ui/views/corewm/window_util.h"
 
 namespace {
 
 // Checks if a given event is a user event.
 bool IsUserEvent(ui::Event* e) {
   if (e) {
     ui::EventType type = e->type();
     if (type != ui::ET_CANCEL_MODE &&
         type != ui::ET_UMA_DATA &&
         type != ui::ET_UNKNOWN)
@@ skipping 506 matching lines @@
   } else {
     if (window->HasFocus())
       window->Blur();
     window->Hide();
   }
 }
 
 void MultiUserWindowManagerChromeOS::ShowWithTransientChildrenRecursive(
     aura::Window* window) {
   aura::Window::Windows::const_iterator it =
-      window->transient_children().begin();
-  for (; it !=  window->transient_children().end(); ++it)
+      views::corewm::GetTransientChildren(window).begin();
+  for (; it != views::corewm::GetTransientChildren(window).end(); ++it)
     ShowWithTransientChildrenRecursive(*it);
 
   // We show all children which were not explicitly hidden.
   TransientWindowToVisibility::iterator it2 =
       transient_window_to_visibility_.find(window);
   if (it2 == transient_window_to_visibility_.end() || it2->second)
     window->Show();
 }
 
 aura::Window* MultiUserWindowManagerChromeOS::GetOwningWindowInTransientChain(
     aura::Window* window) {
   if (!GetWindowOwner(window).empty())
     return NULL;
-  aura::Window* parent = window->transient_parent();
+  aura::Window* parent = views::corewm::GetTransientParent(window);
   while (parent) {
     if (!GetWindowOwner(parent).empty())
       return parent;
-    parent = parent->transient_parent();
+    parent = views::corewm::GetTransientParent(parent);
   }
   return NULL;
 }
 
 void MultiUserWindowManagerChromeOS::AddTransientOwnerRecursive(
     aura::Window* window,
     aura::Window* owned_parent) {
   // First add all child windows.
   aura::Window::Windows::const_iterator it =
-      window->transient_children().begin();
-  for (; it !=  window->transient_children().end(); ++it)
+      views::corewm::GetTransientChildren(window).begin();
+  for (; it != views::corewm::GetTransientChildren(window).end(); ++it)
     AddTransientOwnerRecursive(*it, owned_parent);
 
   // If this window is the owned window, we do not have to handle it again.
   if (window == owned_parent)
     return;
 
   // Remember the current visibility.
   DCHECK(transient_window_to_visibility_.find(window) ==
              transient_window_to_visibility_.end());
   transient_window_to_visibility_[window] = window->IsVisible();
 
   // Add a window observer to make sure that we catch status changes.
   window->AddObserver(this);
 
   // Hide the window if it should not be shown. Note that this hide operation
   // will hide recursively this and all children - but we have already collected
   // their initial view state.
   if (!IsWindowOnDesktopOfUser(owned_parent, current_user_id_))
     SetWindowVisibility(window, false);
 }
 
 void MultiUserWindowManagerChromeOS::RemoveTransientOwnerRecursive(
     aura::Window* window) {
   // First remove all child windows.
   aura::Window::Windows::const_iterator it =
-      window->transient_children().begin();
-  for (; it !=  window->transient_children().end(); ++it)
+      views::corewm::GetTransientChildren(window).begin();
+  for (; it != views::corewm::GetTransientChildren(window).end(); ++it)
     RemoveTransientOwnerRecursive(*it);
 
   // Find from transient window storage the visibility for the given window,
   // set the visibility accordingly and delete the window from the map.
   TransientWindowToVisibility::iterator visibility_item =
       transient_window_to_visibility_.find(window);
   DCHECK(visibility_item != transient_window_to_visibility_.end());
 
   // Remove the window observer.
   window->RemoveObserver(this);
 
   bool unowned_view_state = visibility_item->second;
   transient_window_to_visibility_.erase(visibility_item);
   if (unowned_view_state && !window->IsVisible()) {
     // To prevent these commands from being recorded as any other commands, we
     // are suppressing any window entry changes while this is going on.
     // Instead of calling SetWindowVisible, only show gets called here since all
     // dependents have been shown previously already.
     base::AutoReset<bool> suppressor(&suppress_visibility_changes_, true);
     window->Show();
   }
 }
 
 }  // namespace chrome