mash: Support ShelfModel access in Chrome.

chrome/browser/chromeos/arc/arc_play_store_enabled_preference_handler.cc

 // Copyright 2017 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/chromeos/arc/arc_play_store_enabled_preference_handler.h"
 
-#include "ash/shelf/shelf_model.h"
-#include "ash/shell.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "chrome/browser/chromeos/arc/arc_auth_notification.h"
 #include "chrome/browser/chromeos/arc/arc_optin_uma.h"
 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
 #include "chrome/browser/chromeos/arc/arc_util.h"
 #include "chrome/browser/prefs/pref_service_syncable_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
+#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/chromeos_switches.h"
 #include "components/arc/arc_util.h"
 #include "components/sync_preferences/pref_service_syncable.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace arc {
 
 ArcPlayStoreEnabledPreferenceHandler::ArcPlayStoreEnabledPreferenceHandler(
     Profile* profile,
@@ skipping 46 matching lines @@
     arc_session_manager_->RequestArcDataRemoval();
   }
 
   // ArcAuthNotification may need to be shown.
   PrefServiceSyncableFromProfile(profile_)->AddObserver(this);
   OnIsSyncingChanged();
 }
 
 void ArcPlayStoreEnabledPreferenceHandler::OnPreferenceChanged() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-
   const bool is_play_store_enabled = IsArcPlayStoreEnabledForProfile(profile_);
   if (!IsArcPlayStoreEnabledPreferenceManagedForProfile(profile_)) {
     // Update UMA only for non-Managed cases.
     UpdateOptInActionUMA(is_play_store_enabled ? OptInActionType::OPTED_IN
                                                : OptInActionType::OPTED_OUT);
 
     if (!is_play_store_enabled) {
       // Remove the pinned Play Store icon launcher in Shelf.
       // This is only for non-Managed cases. In managed cases, it is expected
       // to be "disabled" rather than "removed", so keep it here.
-      auto* shelf_model = ash::Shell::HasInstance()
-                              ? ash::Shell::Get()->shelf_model()
-                              : nullptr;
-      if (shelf_model)
-        shelf_model->UnpinAppWithID(kPlayStoreAppId);
+      auto* chrome_launcher_controller = ChromeLauncherController::instance();
+      if (chrome_launcher_controller)
+        chrome_launcher_controller->UnpinAppWithID(kPlayStoreAppId);
     }
   }
 
   // Hide auth notification if it was opened before and arc.enabled pref was
   // explicitly set to true or false.
   if (profile_->GetPrefs()->HasPrefPath(prefs::kArcEnabled))
     ArcAuthNotification::Hide();
 
   UpdateArcSessionManager();
 
@@ skipping 26 matching lines @@
   // TODO(hidehiko): Extract kEnableArcOOBEOptIn check as a utility method.
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           chromeos::switches::kEnableArcOOBEOptIn) &&
       profile_->IsNewProfile() &&
       !profile_->GetPrefs()->HasPrefPath(prefs::kArcEnabled)) {
     ArcAuthNotification::Show(profile_);
   }
 }
 
 }  // namespace arc