mash: Convert shelf to wm::WmWindow types, part 1

ash/system/status_area_widget.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/status_area_widget.h"
 
-#include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/overview/overview_button_tray.h"
 #include "ash/system/status_area_widget_delegate.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/web_notification/web_notification_tray.h"
+#include "ash/wm/common/wm_root_window_controller.h"
+#include "ash/wm/common/wm_window.h"
 #include "ash/wm/window_properties.h"
 #include "base/i18n/time_formatting.h"
-#include "ui/aura/window.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/system/chromeos/session/logout_button_tray.h"
 #include "ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h"
 #endif
 
 namespace ash {
 
-StatusAreaWidget::StatusAreaWidget(aura::Window* status_container,
+StatusAreaWidget::StatusAreaWidget(wm::WmWindow* status_container,
                                    ShelfWidget* shelf_widget)
     : status_area_widget_delegate_(new StatusAreaWidgetDelegate),
       overview_button_tray_(NULL),
       system_tray_(NULL),
       web_notification_tray_(NULL),
 #if defined(OS_CHROMEOS)
       logout_button_tray_(NULL),
       virtual_keyboard_tray_(NULL),
 #endif
       login_status_(user::LOGGED_IN_NONE),
       shelf_widget_(shelf_widget) {
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   params.delegate = status_area_widget_delegate_;
   params.name = "StatusAreaWidget";
-  params.parent = status_container;
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
+  status_container->GetRootWindowController()
+      ->ConfigureWidgetInitParamsForContainer(
+          this, status_container->GetShellWindowId(), &params);
   Init(params);
   set_focus_on_creation(false);
   SetContentsView(status_area_widget_delegate_);
 }
 
 StatusAreaWidget::~StatusAreaWidget() {
 }
 
 void StatusAreaWidget::CreateTrayViews() {
   AddOverviewButtonTray();
@@ skipping 148 matching lines @@
     web_notification_tray_->UpdateAfterLoginStatusChange(login_status);
 #if defined(OS_CHROMEOS)
   if (logout_button_tray_)
     logout_button_tray_->UpdateAfterLoginStatusChange(login_status);
 #endif
   if (overview_button_tray_)
     overview_button_tray_->UpdateAfterLoginStatusChange(login_status);
 }
 
 }  // namespace ash