[mus+ash] Removes WmWindow from ash/shelf and ash/shell

ash/system/web_notification/ash_popup_alignment_delegate.cc

 // Copyright 2014 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/ash_popup_alignment_delegate.h"
 
 #include "ash/public/cpp/shelf_types.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_constants.h"
 #include "ash/shell.h"
 #include "ash/wm_window.h"
 #include "base/i18n/rtl.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/views/message_popup_collection.h"
 #include "ui/wm/core/shadow_types.h"
 
 namespace ash {
 
 namespace {
 
 const int kToastMarginX = 7;
 
 // If there should be no margin for the first item, this value needs to be
-// substracted to flush the message to the shelf (the width of the border +
+// subtracted to flush the message to the shelf (the width of the border +
 // shadow).
 const int kNoToastMarginBorderAndShadowOffset = 2;
 
 }  // namespace
 
 AshPopupAlignmentDelegate::AshPopupAlignmentDelegate(Shelf* shelf)
     : screen_(NULL), shelf_(shelf), tray_bubble_height_(0) {
   shelf_->AddObserver(this);
 }
 
@@ skipping 69 matching lines @@
     const display::Display& display) {
   // Nothing needs to be done.
 }
 
 void AshPopupAlignmentDelegate::ConfigureWidgetInitParamsForContainer(
     views::Widget* widget,
     views::Widget::InitParams* init_params) {
   init_params->shadow_type = views::Widget::InitParams::SHADOW_TYPE_DROP;
   init_params->shadow_elevation = ::wm::ShadowElevation::MEDIUM;
   // On ash, popups go in the status container.
-  shelf_->GetWindow()
-      ->GetRootWindowController()
+  RootWindowController::ForWindow(shelf_->GetWindow())
       ->ConfigureWidgetInitParamsForContainer(
           widget, kShellWindowId_StatusContainer, init_params);
 }
 
 bool AshPopupAlignmentDelegate::IsPrimaryDisplayForNotification() const {
   return screen_ &&
          GetCurrentDisplay().id() == screen_->GetPrimaryDisplay().id();
 }
 
 ShelfAlignment AshPopupAlignmentDelegate::GetAlignment() const {
   return shelf_->alignment();
 }
 
 display::Display AshPopupAlignmentDelegate::GetCurrentDisplay() const {
-  return shelf_->GetWindow()->GetDisplayNearestWindow();
+  return display::Screen::GetScreen()->GetDisplayNearestWindow(
+      shelf_->GetWindow());
 }
 
 void AshPopupAlignmentDelegate::UpdateWorkArea() {
   work_area_ = shelf_->GetUserWorkAreaBounds();
   DoUpdateIfPossible();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // ShelfObserver:
 
@@ skipping 17 matching lines @@
     const display::Display& old_display) {}
 
 void AshPopupAlignmentDelegate::OnDisplayMetricsChanged(
     const display::Display& display,
     uint32_t metrics) {
   if (GetCurrentDisplay().id() == display.id())
     UpdateWorkArea();
 }
 
 }  // namespace ash