Use mojo Shelf interfaces for both mash and classic ash.

ash/common/wm_shell.cc

 // Copyright 2016 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/common/wm_shell.h"
 
 #include <utility>
 
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/accelerators/ash_focus_manager_factory.h"
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/focus_cycler.h"
 #include "ash/common/keyboard/keyboard_ui.h"
 #include "ash/common/new_window_delegate.h"
 #include "ash/common/palette_delegate.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/app_list_shelf_item_delegate.h"
+#include "ash/common/shelf/shelf_controller.h"
 #include "ash/common/shelf/shelf_delegate.h"
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/shelf/shelf_window_watcher.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/brightness_control_delegate.h"
 #include "ash/common/system/keyboard_brightness_control_delegate.h"
 #include "ash/common/system/toast/toast_manager.h"
 #include "ash/common/system/tray/system_tray_controller.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
@@ skipping 41 matching lines @@
   blocking_pool_ = pool;
 
   // Some delegates access WmShell during their construction. Create them here
   // instead of the WmShell constructor.
   accessibility_delegate_.reset(delegate_->CreateAccessibilityDelegate());
   media_delegate_.reset(delegate_->CreateMediaDelegate());
   palette_delegate_ = delegate_->CreatePaletteDelegate();
   toast_manager_.reset(new ToastManager);
 
   // Create the app list item in the shelf data model.
-  AppListShelfItemDelegate::CreateAppListItemAndDelegate(shelf_model_.get());
+  AppListShelfItemDelegate::CreateAppListItemAndDelegate(shelf_model());
 
   // Install the custom factory early on so that views::FocusManagers for Tray,
   // Shelf, and WallPaper could be created by the factory.
   views::FocusManagerFactory::Install(new AshFocusManagerFactory);
 
   new_window_delegate_.reset(delegate_->CreateNewWindowDelegate());
 
   wallpaper_controller_.reset(new WallpaperController(blocking_pool_));
 }
 
 void WmShell::Shutdown() {
   // These members access WmShell in their destructors.
   wallpaper_controller_.reset();
   accessibility_delegate_.reset();
 
   // ShelfWindowWatcher has window observers and a pointer to the shelf model.
   shelf_window_watcher_.reset();
   // ShelfItemDelegate subclasses it owns have complex cleanup to run (e.g. ARC
   // shelf items in Chrome) so explicitly shutdown early.
-  shelf_model_->DestroyItemDelegates();
+  shelf_model()->DestroyItemDelegates();
   // Must be destroyed before FocusClient.
   shelf_delegate_.reset();
 
   // Balances the Install() in Initialize().
   views::FocusManagerFactory::Install(nullptr);
 }
 
+ShelfModel* WmShell::shelf_model() {
+  return shelf_controller_->model();
+}
+
 void WmShell::ShowContextMenu(const gfx::Point& location_in_screen,
                               ui::MenuSourceType source_type) {
   // Bail if there is no active user session or if the screen is locked.
   if (GetSessionStateDelegate()->NumberOfLoggedInUsers() < 1 ||
       GetSessionStateDelegate()->IsScreenLocked()) {
     return;
   }
 
   WmWindow* root = wm::GetRootWindowAt(location_in_screen);
   root->GetRootWindowController()->ShowContextMenu(location_in_screen,
@@ skipping 17 matching lines @@
 
 void WmShell::CreateShelfDelegate() {
   // May be called multiple times as shelves are created and destroyed.
   if (shelf_delegate_)
     return;
   // Must occur after SessionStateDelegate creation and user login because
   // Chrome's implementation of ShelfDelegate assumes it can get information
   // about multi-profile login state.
   DCHECK(GetSessionStateDelegate());
   DCHECK_GT(GetSessionStateDelegate()->NumberOfLoggedInUsers(), 0);
-  shelf_delegate_.reset(delegate_->CreateShelfDelegate(shelf_model_.get()));
-  shelf_window_watcher_.reset(new ShelfWindowWatcher(shelf_model_.get()));
+  shelf_delegate_.reset(delegate_->CreateShelfDelegate(shelf_model()));
+  shelf_window_watcher_.reset(new ShelfWindowWatcher(shelf_model()));
 }
 
 void WmShell::OnMaximizeModeStarted() {
   FOR_EACH_OBSERVER(ShellObserver, shell_observers_, OnMaximizeModeStarted());
 }
 
 void WmShell::OnMaximizeModeEnded() {
   FOR_EACH_OBSERVER(ShellObserver, shell_observers_, OnMaximizeModeEnded());
 }
 
@@ skipping 61 matching lines @@
   shelf_delegate_ = std::move(test_delegate);
 }
 
 void WmShell::SetPaletteDelegateForTesting(
     std::unique_ptr<PaletteDelegate> palette_delegate) {
   palette_delegate_ = std::move(palette_delegate);
 }
 
 WmShell::WmShell(std::unique_ptr<ShellDelegate> shell_delegate)
     : delegate_(std::move(shell_delegate)),
-      focus_cycler_(new FocusCycler),
+      focus_cycler_(base::MakeUnique<FocusCycler>()),
       immersive_context_(base::MakeUnique<ImmersiveContextAsh>()),
-      shelf_model_(new ShelfModel),  // Must create before ShelfDelegate.
-      system_tray_controller_(
-          new SystemTrayController(delegate_->GetShellConnector())),
-      system_tray_notifier_(new SystemTrayNotifier),
+      shelf_controller_(base::MakeUnique<ShelfController>()),
+      system_tray_controller_(base::MakeUnique<SystemTrayController>(
+          delegate_->GetShellConnector())),
+      system_tray_notifier_(base::MakeUnique<SystemTrayNotifier>()),
       wallpaper_delegate_(delegate_->CreateWallpaperDelegate()),
-      window_cycle_controller_(new WindowCycleController),
-      window_selector_controller_(new WindowSelectorController) {
+      window_cycle_controller_(base::MakeUnique<WindowCycleController>()),
+      window_selector_controller_(
+          base::MakeUnique<WindowSelectorController>()) {
 #if defined(OS_CHROMEOS)
   brightness_control_delegate_.reset(new system::BrightnessControllerChromeos);
   keyboard_brightness_control_delegate_.reset(new KeyboardBrightnessController);
 #endif
 }
 
 WmShell::~WmShell() {}
 
 WmRootWindowController* WmShell::GetPrimaryRootWindowController() {
   return GetPrimaryRootWindow()->GetRootWindowController();
@@ skipping 128 matching lines @@
 void WmShell::DeleteToastManager() {
   toast_manager_.reset();
 }
 
 void WmShell::SetAcceleratorController(
     std::unique_ptr<AcceleratorController> accelerator_controller) {
   accelerator_controller_ = std::move(accelerator_controller);
 }
 
 }  // namespace ash