mash: Convert AshPopupAlignmentDelegate to wm common types

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/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/shelf_types.h"
-#include "ash/common/wm_lookup.h"
+#include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
-#include "ash/display/window_tree_host_manager.h"
-#include "ash/shelf/shelf_layout_manager.h"
-#include "ash/shelf/shelf_widget.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"
 
 namespace ash {
 
 namespace {
 
 const int kToastMarginX = 3;
 
 // 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 +
 // shadow).
 const int kNoToastMarginBorderAndShadowOffset = 2;
 
-}
+}  // namespace
 
-AshPopupAlignmentDelegate::AshPopupAlignmentDelegate(ShelfLayoutManager* shelf)
+AshPopupAlignmentDelegate::AshPopupAlignmentDelegate(WmShelf* shelf)
     : screen_(NULL), shelf_(shelf), system_tray_height_(0) {
   shelf_->AddObserver(this);
 }
 
 AshPopupAlignmentDelegate::~AshPopupAlignmentDelegate() {
   if (screen_)
     screen_->RemoveObserver(this);
   WmShell::Get()->RemoveShellObserver(this);
   shelf_->RemoveObserver(this);
 }
 
 void AshPopupAlignmentDelegate::StartObserving(
     display::Screen* screen,
     const display::Display& display) {
   screen_ = screen;
   work_area_ = display.work_area();
   screen->AddObserver(this);
   WmShell::Get()->AddShellObserver(this);
   if (system_tray_height_ > 0)
     UpdateWorkArea();
 }
 
 void AshPopupAlignmentDelegate::SetSystemTrayHeight(int height) {
   system_tray_height_ = height;
 
   // If the shelf is shown during auto-hide state, the distance from the edge
   // should be reduced by the height of shelf's shown height.
-  if (shelf_->visibility_state() == SHELF_AUTO_HIDE &&
-      shelf_->auto_hide_state() == SHELF_AUTO_HIDE_SHOWN) {
+  if (shelf_->GetVisibilityState() == SHELF_AUTO_HIDE &&
+      shelf_->GetAutoHideState() == SHELF_AUTO_HIDE_SHOWN) {
     system_tray_height_ -= GetShelfConstant(SHELF_SIZE) - kShelfAutoHideSize;
   }
 
   if (system_tray_height_ > 0)
     system_tray_height_ += message_center::kMarginBetweenItems;
   else
     system_tray_height_ = 0;
 
   DoUpdateIfPossible();
 }
@@ skipping 30 matching lines @@
 void AshPopupAlignmentDelegate::RecomputeAlignment(
     const display::Display& display) {
   // Nothing needs to be done.
 }
 
 ShelfAlignment AshPopupAlignmentDelegate::GetAlignment() const {
   return shelf_->GetAlignment();
 }
 
 display::Display AshPopupAlignmentDelegate::GetCurrentDisplay() const {
-  return WmLookup::Get()
-      ->GetWindowForWidget(shelf_->shelf_widget())
-      ->GetDisplayNearestWindow();
+  return shelf_->GetWindow()->GetDisplayNearestWindow();
 }
 
 void AshPopupAlignmentDelegate::UpdateWorkArea() {
-  work_area_ = shelf_->user_work_area_bounds();
+  work_area_ = shelf_->GetUserWorkAreaBounds();
   DoUpdateIfPossible();
 }
 
+///////////////////////////////////////////////////////////////////////////////
+// ShellObserver:
+
 void AshPopupAlignmentDelegate::OnDisplayWorkAreaInsetsChanged() {
   UpdateWorkArea();
 }
 
+///////////////////////////////////////////////////////////////////////////////
+// WmShelfObserver:
+
 void AshPopupAlignmentDelegate::WillChangeVisibilityState(
     ShelfVisibilityState new_state) {
   UpdateWorkArea();
 }
 
 void AshPopupAlignmentDelegate::OnAutoHideStateChanged(
     ShelfAutoHideState new_state) {
   UpdateWorkArea();
 }
 
+///////////////////////////////////////////////////////////////////////////////
+// display::DisplayObserver:
+
 void AshPopupAlignmentDelegate::OnDisplayAdded(
     const display::Display& new_display) {}
 
 void AshPopupAlignmentDelegate::OnDisplayRemoved(
     const display::Display& old_display) {}
 
 void AshPopupAlignmentDelegate::OnDisplayMetricsChanged(
     const display::Display& display,
     uint32_t metrics) {
   if (GetCurrentDisplay().id() == display.id())
     UpdateWorkArea();
 }
 
 }  // namespace ash