Revert 119976 - Adds two new observer methods to allow code to be notified when a Window is added/removed from a RootWindow. This allows hierarchy-specific cleanup code to execute when a Window is removed rather than when it is destroyed, necessary for multiple root windows.

http://crbug.com/112131
TEST=see unittests
Review URL: https://chromiumcodereview.appspot.com/9315015

TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9315017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119986 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 6 deletions

diff --git a/ui/aura/root_window.h b/ui/aura/root_window.h
index ec0f09f..823d87b 100644
--- a/ui/aura/root_window.h
+++ b/ui/aura/root_window.h
@@ -192,9 +192,13 @@ class AURA_EXPORT RootWindow : public ui::CompositorDelegate,
   // Overridden from ui::CompositorDelegate:
   virtual void ScheduleDraw() OVERRIDE;
 
- private:
-  friend class Window;
+  // Overridden from Window:
+  virtual void OnWindowAttachedToRootWindow(
+      Window* window) OVERRIDE;
+  virtual void OnWindowDetachingFromRootWindow(
+      Window* window) OVERRIDE;
 
+ private:
   RootWindow();
   virtual ~RootWindow();
 
@@ -208,10 +212,6 @@ class AURA_EXPORT RootWindow : public ui::CompositorDelegate,
   ui::GestureStatus ProcessGestureEvent(Window* target, GestureEvent* event);
   bool ProcessGestures(GestureRecognizer::Gestures* gestures);
 
-  // Called when a Window is attached or detached from the RootWindow.
-  void OnWindowAddedToRootWindow(Window* window);
-  void OnWindowRemovedFromRootWindow(Window* window);
-
   // Overridden from Window:
   virtual bool CanFocus() const OVERRIDE;
   virtual bool CanReceiveEvents() const OVERRIDE;