Make GetRootWindow() return a Window instead of a RootWindow.

ash/system/web_notification/web_notification_tray.cc

 // Copyright (c) 2012 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 "ash/system/web_notification/web_notification_tray.h"
 
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_layout_manager_observer.h"
@@ skipping 65 matching lines @@
 class WorkAreaObserver : public ShelfLayoutManagerObserver,
                          public ShellObserver {
  public:
   WorkAreaObserver();
   virtual ~WorkAreaObserver();
 
   void SetSystemTrayHeight(int height);
 
   // Starts observing |shelf| and shell and sends the change to |collection|.
   void StartObserving(message_center::MessagePopupCollection* collection,
-                      aura::RootWindow* root_window);
+                      aura::Window* root_window);
 
   // Stops the observing session.
   void StopObserving();
 
   // Overridden from ShellObserver:
   virtual void OnDisplayWorkAreaInsetsChanged() OVERRIDE;
 
   // Overridden from ShelfLayoutManagerObserver:
   virtual void OnAutoHideStateChanged(ShelfAutoHideState new_state) OVERRIDE;
 
  private:
   // Updates |shelf_| from |root_window_|.
   void UpdateShelf();
 
   message_center::MessagePopupCollection* collection_;
-  aura::RootWindow* root_window_;
+  aura::Window* root_window_;
   ShelfLayoutManager* shelf_;
   int system_tray_height_;
 
   DISALLOW_COPY_AND_ASSIGN(WorkAreaObserver);
 };
 
 WorkAreaObserver::WorkAreaObserver()
     : collection_(NULL),
       root_window_(NULL),
       shelf_(NULL),
@@ skipping 19 matching lines @@
     system_tray_height_ += message_center::kMarginBetweenItems;
 
   if (!shelf_)
     return;
 
   OnAutoHideStateChanged(shelf_->auto_hide_state());
 }
 
 void WorkAreaObserver::StartObserving(
     message_center::MessagePopupCollection* collection,
-    aura::RootWindow* root_window) {
+    aura::Window* root_window) {
   DCHECK(collection);
   collection_ = collection;
   root_window_ = root_window;
   UpdateShelf();
   Shell::GetInstance()->AddShellObserver(this);
   if (system_tray_height_ > 0)
     OnAutoHideStateChanged(shelf_->auto_hide_state());
 }
 
 void WorkAreaObserver::StopObserving() {
@@ skipping 189 matching lines @@
 
   int max_height = 0;
   aura::Window* status_area_window = status_area_widget()->GetNativeView();
   switch (GetShelfLayoutManager()->GetAlignment()) {
     case SHELF_ALIGNMENT_BOTTOM: {
       gfx::Rect shelf_bounds = GetShelfLayoutManager()->GetIdealBounds();
       max_height = shelf_bounds.y();
       break;
     }
     case SHELF_ALIGNMENT_TOP: {
-      aura::RootWindow* root = status_area_window->GetRootWindow();
+      aura::Window* root = status_area_window->GetRootWindow();
       max_height =
           root->bounds().height() - status_area_window->bounds().height();
       break;
     }
     case SHELF_ALIGNMENT_LEFT:
     case SHELF_ALIGNMENT_RIGHT: {
       // Assume that the bottom line of the status area widget and the bubble
       // are aligned.
       max_height = status_area_window->GetBoundsInRootWindow().bottom();
       break;
@@ skipping 244 matching lines @@
 
 message_center::MessageCenterBubble*
 WebNotificationTray::GetMessageCenterBubbleForTest() {
   if (!message_center_bubble())
     return NULL;
   return static_cast<message_center::MessageCenterBubble*>(
       message_center_bubble()->bubble());
 }
 
 }  // namespace ash