mash: Convert AshPopupAlignmentDelegate to wm common types

ash/shelf/shelf.cc

 // Copyright 2013 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/shelf/shelf.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/shelf/shelf_item_delegate.h"
 #include "ash/common/shelf/shelf_item_delegate_manager.h"
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/focus_cycler.h"
 #include "ash/root_window_controller.h"
 #include "ash/root_window_settings.h"

[msw, 2016/06/16 18:56:48]

nit: remove if not needed.

[James Cook, 2016/06/16 21:08:14]

Nice catch. Done.

 #include "ash/screen_util.h"
 #include "ash/shelf/shelf_delegate.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_navigator.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shelf/shelf_view.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/wm/window_properties.h"
 #include "ui/aura/window.h"
@@ skipping 37 matching lines @@
   return Shelf::ForWindow(Shell::GetPrimaryRootWindow());
 }
 
 // static
 Shelf* Shelf::ForWindow(const aura::Window* window) {
   ShelfWidget* shelf_widget =
       RootWindowController::ForWindow(window)->shelf_widget();
   return shelf_widget ? shelf_widget->shelf() : nullptr;
 }
 
-// static
-Shelf* Shelf::ForDisplayId(int64_t display_id) {
-  for (aura::Window* window : Shell::GetInstance()->GetAllRootWindows()) {
-    RootWindowSettings* settings = GetRootWindowSettings(window);
-    if (settings->display_id == display_id && settings->controller) {
-      ShelfWidget* shelf_widget = settings->controller->shelf_widget();
-      return shelf_widget ? shelf_widget->shelf() : nullptr;
-    }
-  }
-  return nullptr;
-}
-
 void Shelf::SetAlignment(ShelfAlignment alignment) {
   if (alignment_ == alignment)
     return;
 
   if (shelf_locking_manager_.is_locked() &&
       alignment != SHELF_ALIGNMENT_BOTTOM_LOCKED) {
     shelf_locking_manager_.set_stored_alignment(alignment);
     return;
   }
 
@@ skipping 128 matching lines @@
 
 gfx::Rect Shelf::GetVisibleItemsBoundsInScreen() const {
   return shelf_view_->GetVisibleItemsBoundsInScreen();
 }
 
 app_list::ApplicationDragAndDropHost* Shelf::GetDragAndDropHostForAppList() {
   return shelf_view_;
 }
 
 }  // namespace ash