mash: Create and show a shelf in mash.

ash/app_list/app_list_presenter_delegate.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/app_list/app_list_presenter_delegate.h"
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/ash_switches.h"
 #include "ash/common/shelf/app_list_button.h"
 #include "ash/common/shelf/shelf_types.h"
+#include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm/wm_screen_util.h"
 #include "ash/common/wm_lookup.h"
+#include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "ui/app_list/app_list_constants.h"
@@ skipping 110 matching lines @@
 }
 
 AppListPresenterDelegate::~AppListPresenterDelegate() {
   DCHECK(view_);
   keyboard::KeyboardController* keyboard_controller =
       keyboard::KeyboardController::GetInstance();
   if (keyboard_controller)
     keyboard_controller->RemoveObserver(this);
   Shell::GetInstance()->RemovePreTargetHandler(this);
   WmWindow* window = WmLookup::Get()->GetWindowForWidget(view_->GetWidget());
-  Shelf::ForWindow(window)->RemoveIconObserver(this);
+  window->GetRootWindowController()->GetShelf()->RemoveObserver(this);
   WmShell::Get()->RemoveShellObserver(this);
 }
 
 app_list::AppListViewDelegate* AppListPresenterDelegate::GetViewDelegate() {
   return view_delegate_factory_->GetDelegate();
 }
 
 void AppListPresenterDelegate::Init(app_list::AppListView* view,
                                     int64_t display_id,
                                     int current_apps_page) {
@@ skipping 41 matching lines @@
                                        applist_button->GetWidget()),
         GetBubbleArrow(container), true /* border_accepts_events */);
     view->SetArrowPaintType(views::BubbleBorder::PAINT_NONE);
   }
 
   keyboard::KeyboardController* keyboard_controller =
       keyboard::KeyboardController::GetInstance();
   if (keyboard_controller)
     keyboard_controller->AddObserver(this);
   Shell::GetInstance()->AddPreTargetHandler(this);
-  shelf->AddIconObserver(this);
+  WmWindow* window = WmShell::Get()->GetRootWindowForDisplayId(display_id);
+  window->GetRootWindowController()->GetShelf()->AddObserver(this);
 
   // By setting us as DnD recipient, the app list knows that we can
   // handle items.
   view->SetDragAndDropHostOfCurrentAppList(
       shelf->GetDragAndDropHostForAppList());
 }
 
 void AppListPresenterDelegate::OnShown(int64_t display_id) {
   is_visible_ = true;
   // Update applist button status when app list visibility is changed.
@@ skipping 127 matching lines @@
     presenter_->Dismiss();
 }
 
 void AppListPresenterDelegate::OnMaximizeModeEnded() {
   // See the comments of OnMaximizeModeStarted().
   if (IsFullscreenAppListEnabled() && is_visible_)
     presenter_->Dismiss();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// AppListPresenterDelegate, ShelfIconObserver implementation:
+// AppListPresenterDelegate, WmShelfObserver implementation:
 
 void AppListPresenterDelegate::OnShelfIconPositionsChanged() {
   UpdateBounds();
 }
 
 }  // namespace ash