Moves transient window observer methods out of WindowObserver

Moves transient window observer methods out of WindowObserver

As transient logic has been moved outside of aura it doesn't make
sense for these methods to be in WindowObserver anymore. Instead they
have been added to TransientWindowManager.

BUG=none
TEST=none
R=ben@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=244176

[sky, 2014-01-09 18:40:06]

skuhne: multi_user_window_manager_chromeos*
pkotwicz: ash/wm/immersive_fullscreen_controller*
ben: the rest

[Ben Goodger (Google), 2014-01-09 18:43:17]

lgtm

https://codereview.chromium.org/132013004/diff/60001/ash/wm/immersive_fullscr...
File ash/wm/immersive_fullscreen_controller.h (right):

https://codereview.chromium.org/132013004/diff/60001/ash/wm/immersive_fullscr...
ash/wm/immersive_fullscreen_controller.h:146: //
views::coremw::TransientWindowObserver overrides:
corewm

[pkotwicz, 2014-01-09 18:47:53]

ash/wm/immersive_fullscreen_controller* changes LGTM

[Mr4D (OOO till 08-26), 2014-01-09 19:00:55]

chrome/browser/ui/ash/multi_user lgtm.

[commit-bot: I haz the power, 2014-01-09 21:36:34]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/sky@chromium.org/132013004/120001

[commit-bot: I haz the power, 2014-01-10 03:36:51]

Failed to apply patch for
chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file
chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc
  Hunk #1 FAILED at 36.
  Hunk #2 succeeded at 239 (offset 4 lines).
  Hunk #3 succeeded at 441 (offset 25 lines).
  Hunk #4 succeeded at 490 (offset 27 lines).
  Hunk #5 succeeded at 505 (offset 27 lines).
  Hunk #6 succeeded at 633 (offset 27 lines).
  Hunk #7 succeeded at 658 (offset 27 lines).
  1 out of 7 hunks FAILED -- saving rejects to file
chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc.rej

Patch:      
chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc
Index: chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc
diff --git
a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc
b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc
index
43c69d3c0395abccc75a5e041936f7714b6d97d0..168f2281c61cd36a2bf841800c258d5a38c8838f
100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc
@@ -36,6 +36,7 @@
 #include "ui/aura/window.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/events/event.h"
+#include "ui/views/corewm/transient_window_manager.h"
 #include "ui/views/corewm/window_util.h"
 
 namespace {
@@ -235,9 +236,10 @@ void MultiUserWindowManagerChromeOS::SetWindowOwner(
   // Remember the initial visibility of the window.
   window_to_entry_[window]->set_show(window->IsVisible());
 
-  // Set the window and the state observer.
+  // Add observers to track state changes.
   window->AddObserver(this);
   ash::wm::GetWindowState(window)->AddObserver(this);
+  views::corewm::TransientWindowManager::Get(window)->AddObserver(this);
 
   // Check if this window was created due to a user interaction. If it was,
   // transfer it to the current user.
@@ -415,8 +417,8 @@ void
MultiUserWindowManagerChromeOS::OnWindowDestroyed(aura::Window* window) {
     RemoveTransientOwnerRecursive(window);
     return;
   }
-  // Remove the state and the window observer.
   ash::wm::GetWindowState(window)->RemoveObserver(this);
+  views::corewm::TransientWindowManager::Get(window)->RemoveObserver(this);
   // Remove the window from the owners list.
   delete window_to_entry_[window];
   window_to_entry_.erase(window);
@@ -462,7 +464,7 @@ void
MultiUserWindowManagerChromeOS::OnWindowVisibilityChanged(
     SetWindowVisibility(window, false);
 }
 
-void MultiUserWindowManagerChromeOS::OnAddTransientChild(
+void MultiUserWindowManagerChromeOS::OnTransientChildAdded(
     aura::Window* window,
     aura::Window* transient_window) {
   if (!GetWindowOwner(window).empty()) {
@@ -477,7 +479,7 @@ void MultiUserWindowManagerChromeOS::OnAddTransientChild(
   AddTransientOwnerRecursive(transient_window, owned_parent);
 }
 
-void MultiUserWindowManagerChromeOS::OnRemoveTransientChild(
+void MultiUserWindowManagerChromeOS::OnTransientChildRemoved(
     aura::Window* window,
     aura::Window* transient_window) {
   // Remove the transient child if the window itself is owned, or one of the
@@ -605,8 +607,9 @@ void
MultiUserWindowManagerChromeOS::AddTransientOwnerRecursive(
              transient_window_to_visibility_.end());
   transient_window_to_visibility_[window] = window->IsVisible();
 
-  // Add a window observer to make sure that we catch status changes.
+  // Add observers to track state changes.
   window->AddObserver(this);
+  views::corewm::TransientWindowManager::Get(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
@@ -629,8 +632,8 @@ void
MultiUserWindowManagerChromeOS::RemoveTransientOwnerRecursive(
       transient_window_to_visibility_.find(window);
   DCHECK(visibility_item != transient_window_to_visibility_.end());
 
-  // Remove the window observer.
   window->RemoveObserver(this);
+  views::corewm::TransientWindowManager::Get(window)->RemoveObserver(this);
 
   bool unowned_view_state = visibility_item->second;
   transient_window_to_visibility_.erase(visibility_item);

[commit-bot: I haz the power, 2014-01-10 14:55:24]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/sky@chromium.org/132013004/350001

[commit-bot: I haz the power, 2014-01-10 16:55:20]

Change committed as 244176