mash: Remove ShelfDelegate; move functions to ShelfModel.

ash/shell.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/shell.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 
@@ skipping 37 matching lines @@
 #include "ash/magnifier/partial_magnification_controller.h"
 #include "ash/media_controller.h"
 #include "ash/new_window_controller.h"
 #include "ash/palette_delegate.h"
 #include "ash/public/cpp/config.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_controller.h"
 #include "ash/session/session_state_delegate.h"
 #include "ash/shelf/shelf_controller.h"
-#include "ash/shelf/shelf_delegate.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_window_watcher.h"
 #include "ash/shelf/wm_shelf.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_init_params.h"
 #include "ash/shell_observer.h"
 #include "ash/shell_port.h"
 #include "ash/shutdown_controller.h"
 #include "ash/sticky_keys/sticky_keys_controller.h"
 #include "ash/system/bluetooth/bluetooth_notification_controller.h"
@@ skipping 337 matching lines @@
 }
 
 FirstRunHelper* Shell::CreateFirstRunHelper() {
   return new FirstRunHelperImpl;
 }
 
 void Shell::CreateShelfView() {
   // Must occur after SessionController creation and user login.
   DCHECK(session_controller());
   DCHECK_GT(session_controller()->NumberOfLoggedInUsers(), 0);
-  CreateShelfDelegate();
 
+  // Notify the ShellDelegate that the shelf is being initialized.
+  // TODO(msw): Refine ChromeLauncherControllerImpl lifetime management.
+  shell_delegate_->ShelfInit();

[James Cook, 2017/04/19 00:23:47]

Aside: It's unfortunate that ShelfInit() code has to be written to support being
called multiple times. Hopefully that will get better with lifetime changes.

[msw, 2017/04/19 20:56:06]

Acknowledged.

+
+  if (!shelf_window_watcher_)
+    shelf_window_watcher_ = base::MakeUnique<ShelfWindowWatcher>(shelf_model());
   for (WmWindow* root_window : shell_port_->GetAllRootWindows())
     root_window->GetRootWindowController()->CreateShelfView();
 }
 
 void Shell::SetLargeCursorSizeInDip(int large_cursor_size_in_dip) {
   window_tree_host_manager_->cursor_window_controller()
       ->SetLargeCursorSizeInDip(large_cursor_size_in_dip);
 }
 
 void Shell::SetCursorCompositingEnabled(bool enabled) {
@@ skipping 292 matching lines @@
   // Balances the Install() in Initialize().
   views::FocusManagerFactory::Install(nullptr);
 
   // 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();
 
-  // Must be destroyed before FocusController.
-  shelf_delegate_.reset();
+  // Notify the ShellDelegate that the shelf is shutting down.
+  // TODO(msw): Refine ChromeLauncherControllerImpl lifetime management.
+  shell_delegate_->ShelfShutdown();
 
   // Removes itself as an observer of |pref_service_|.
   shelf_controller_.reset();
 
   shell_port_->Shutdown();
 
   // Depends on |focus_controller_|, so must be destroyed before.
   window_tree_host_manager_.reset();
   focus_controller_->RemoveObserver(this);
   focus_controller_.reset();
@@ skipping 418 matching lines @@
       controller->CloseChildWindows();
     } else {
       while (!root_window->children().empty()) {
         aura::Window* child = root_window->children()[0];
         delete child;
       }
     }
   }
 }
 
-void Shell::CreateShelfDelegate() {
-  // May be called multiple times as shelves are created and destroyed.
-  if (shelf_delegate_)
-    return;
-  // Must occur after SessionController creation and user login because
-  // Chrome's implementation of ShelfDelegate assumes it can get information
-  // about multi-profile login state.
-  DCHECK(session_controller());
-  DCHECK_GT(session_controller()->NumberOfLoggedInUsers(), 0);
-  shelf_delegate_.reset(shell_delegate_->CreateShelfDelegate(shelf_model()));
-  shelf_window_watcher_ = base::MakeUnique<ShelfWindowWatcher>(shelf_model());
-}
-
 bool Shell::CanWindowReceiveEvents(aura::Window* window) {
   RootWindowControllerList controllers = GetAllRootWindowControllers();
   for (RootWindowController* controller : controllers) {
     if (controller->CanWindowReceiveEvents(window))
       return true;
   }
   return false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 65 matching lines @@
 void Shell::OnPrefServiceInitialized(
     std::unique_ptr<::PrefService> pref_service) {
   if (!instance_)
     return;
   // |pref_service_| is null if can't connect to Chrome (as happens when
   // running mash outside of chrome --mash and chrome isn't built).
   pref_service_ = std::move(pref_service);
 }
 
 }  // namespace ash