mash: Remove ShelfDelegate; move functions to ShelfModel.

chrome/browser/ui/ash/chrome_shell_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 "chrome/browser/ui/ash/chrome_shell_delegate.h"
 
 #include <stddef.h>
 
 #include <limits>
 
@@ skipping 371 matching lines @@
       manager->Enable(context);
     else
       manager->Disable();
   }
 
   DISALLOW_COPY_AND_ASSIGN(AccessibilityDelegateImpl);
 };
 
 }  // namespace
 
-ChromeShellDelegate::ChromeShellDelegate()
-    : shelf_delegate_(NULL) {
+ChromeShellDelegate::ChromeShellDelegate() {
   PlatformInit();
 }
 
-ChromeShellDelegate::~ChromeShellDelegate() {
-}
+ChromeShellDelegate::~ChromeShellDelegate() {}
 
 service_manager::Connector* ChromeShellDelegate::GetShellConnector() const {
   return content::ServiceManagerConnection::GetForProcess()->GetConnector();
 }
 
 bool ChromeShellDelegate::IsMultiProfilesEnabled() const {
   if (!profiles::IsMultipleProfilesEnabled())
     return false;
   // If there is a user manager, we need to see that we can at least have 2
   // simultaneous users to allow this feature.
@@ skipping 83 matching lines @@
       displayer.browser(), url_to_open,
       ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK |
                                 ui::PAGE_TRANSITION_FROM_API));
 
   // Since the ScopedTabbedBrowserDisplayer does not guarantee that the
   // browser will be shown on the active desktop, we ensure the visibility.
   multi_user_util::MoveWindowToCurrentDesktop(
       displayer.browser()->window()->GetNativeWindow());
 }
 
-ash::ShelfDelegate* ChromeShellDelegate::CreateShelfDelegate(
-    ash::ShelfModel* model) {
-  if (!shelf_delegate_) {
-    shelf_delegate_ = new ChromeLauncherControllerImpl(nullptr, model);
-    shelf_delegate_->Init();
+void ChromeShellDelegate::ShelfInit() {
+  if (!launcher_controller_) {
+    launcher_controller_ = base::MakeUnique<ChromeLauncherControllerImpl>(
+        nullptr, ash::Shell::Get()->shelf_model());
+    launcher_controller_->Init();
   }
-  return shelf_delegate_;
+}
+
+void ChromeShellDelegate::ShelfShutdown() {
+  launcher_controller_.reset();
 }
 
 ui::MenuModel* ChromeShellDelegate::CreateContextMenu(
     ash::WmShelf* wm_shelf,
     const ash::ShelfItem* item) {
   // Don't show context menu for exclusive app runtime mode.
   if (chrome::IsRunningInAppMode())
     return nullptr;
 
-  // No context menu before |shelf_delegate_| is created. This is possible
-  // now because CreateShelfDelegate is called by session state change
-  // via mojo asynchronously. Context menu could be triggered when the
-  // mojo message is still in-fly and crashes.
-  if (!shelf_delegate_)
-    return nullptr;
-
-  return LauncherContextMenu::Create(shelf_delegate_, item, wm_shelf);
+  return LauncherContextMenu::Create(launcher_controller_.get(), item,

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

Does this still need a null check for launcher_controller_?

The timing is a little unclear to me.

If it's definitely not null, DCHECK it.

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

I restored the null check and comment.

+                                     wm_shelf);
 }
 
 ash::GPUSupport* ChromeShellDelegate::CreateGPUSupport() {
   // Chrome uses real GPU support.
   return new ash::GPUSupportImpl;
 }
 
 base::string16 ChromeShellDelegate::GetProductName() const {
   return l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
 }
@@ skipping 75 matching lines @@
       Profile* profile = content::Details<Profile>(details).ptr();
       if (!chromeos::ProfileHelper::IsSigninProfile(profile) &&
           !profile->IsGuestSession() && !profile->IsSupervised()) {
         // Start the error notifier services to show auth/sync notifications.
         SigninErrorNotifierFactory::GetForProfile(profile);
         SyncErrorNotifierFactory::GetForProfile(profile);
       }
       // Do not use chrome::NOTIFICATION_PROFILE_ADDED because the
       // profile is not fully initialized by user_manager.  Use
       // chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED instead.
-      if (shelf_delegate_)
-        shelf_delegate_->OnUserProfileReadyToSwitch(profile);
+      if (launcher_controller_)
+        launcher_controller_->OnUserProfileReadyToSwitch(profile);
       break;
     }
     case chrome::NOTIFICATION_SESSION_STARTED:
       // InitAfterFirstSessionStart() should only be called once upon system
       // start.
       if (user_manager::UserManager::Get()->GetLoggedInUsers().size() < 2)
         InitAfterFirstSessionStart();
       break;
     default:
       NOTREACHED() << "Unexpected notification " << type;
   }
 }
 
 void ChromeShellDelegate::PlatformInit() {
   registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
                  content::NotificationService::AllSources());
   registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED,
                  content::NotificationService::AllSources());
 }