Moved methods that don't rely on internal state out of ChromeLauncherController.

chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.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/launcher/app_shortcut_launcher_item_controller.h"
 
 #include <stddef.h>
 
 #include "ash/wm/window_util.h"
 #include "chrome/browser/chromeos/arc/arc_support_host.h"
 #include "chrome/browser/extensions/launch_util.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
 #include "chrome/browser/ui/ash/launcher/arc_playstore_shortcut_launcher_item_controller.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_tab.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
+#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.h"
 #include "chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h"
 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
 #include "chrome/browser/ui/ash/launcher/launcher_controller_helper.h"
 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
@@ skipping 47 matching lines @@
 // but do not have any associated windows (opening a shortcut will replace the
 // item with the appropriate LauncherItemController type).
 AppShortcutLauncherItemController::AppShortcutLauncherItemController(
     const std::string& app_id,
     ChromeLauncherController* controller)
     : LauncherItemController(TYPE_SHORTCUT, app_id, controller),
       chrome_launcher_controller_(controller) {
   // To detect V1 applications we use their domain and match them against the
   // used URL. This will also work with applications like Google Drive.
   const Extension* extension =
-      launcher_controller()->GetExtensionForAppID(app_id);
+      GetExtensionForAppID(app_id, controller->GetProfile());
   // Some unit tests have no real extension.
   if (extension) {
     set_refocus_url(GURL(
         extensions::AppLaunchInfo::GetLaunchWebURL(extension).spec() + "*"));
   }
 }
 
 AppShortcutLauncherItemController::~AppShortcutLauncherItemController() {
 }
 
@@ skipping 38 matching lines @@
   }
   return ActivateContent(content);
 }
 
 void AppShortcutLauncherItemController::Close() {
   // Close all running 'programs' of this type.
   std::vector<content::WebContents*> content =
       launcher_controller()->GetV1ApplicationsFromAppId(app_id());
   for (size_t i = 0; i < content.size(); i++) {
     Browser* browser = chrome::FindBrowserWithWebContents(content[i]);
-    if (!browser || !launcher_controller()->IsBrowserFromActiveUser(browser))
+    if (!browser || !IsBrowserFromActiveUser(browser))
       continue;
     TabStripModel* tab_strip = browser->tab_strip_model();
     int index = tab_strip->GetIndexOfWebContents(content[i]);
     DCHECK(index != TabStripModel::kNoTab);
     tab_strip->CloseWebContentsAt(index, TabStripModel::CLOSE_NONE);
   }
 }
 
 ChromeLauncherAppMenuItems
 AppShortcutLauncherItemController::GetApplicationList(int event_flags) {
@@ skipping 20 matching lines @@
 
   URLPattern refocus_pattern(URLPattern::SCHEME_ALL);
   refocus_pattern.SetMatchAllURLs(true);
 
   if (!refocus_url_.is_empty()) {
     refocus_pattern.SetMatchAllURLs(false);
     refocus_pattern.Parse(refocus_url_.spec());
   }
 
   const Extension* extension =
-      launcher_controller()->GetExtensionForAppID(app_id());
+      GetExtensionForAppID(app_id(), launcher_controller()->GetProfile());
 
   // It is possible to come here While an extension gets loaded.
   if (!extension)
     return items;
 
   for (auto* browser : *BrowserList::GetInstance()) {
-    if (!launcher_controller()->IsBrowserFromActiveUser(browser))
+    if (!IsBrowserFromActiveUser(browser))
       continue;
     TabStripModel* tab_strip = browser->tab_strip_model();
     for (int index = 0; index < tab_strip->count(); index++) {
       content::WebContents* web_contents = tab_strip->GetWebContentsAt(index);
       if (WebContentMatchesApp(
               extension, refocus_pattern, web_contents, browser))
         items.push_back(web_contents);
     }
   }
   return items;
@@ skipping 18 matching lines @@
 ash::ShelfMenuModel* AppShortcutLauncherItemController::CreateApplicationMenu(
     int event_flags) {
   return new LauncherApplicationMenuItemModel(GetApplicationList(event_flags));
 }
 
 bool AppShortcutLauncherItemController::IsDraggable() {
   return true;
 }
 
 bool AppShortcutLauncherItemController::CanPin() const {
-  return launcher_controller()->GetPinnable(app_id()) ==
+  return GetPinnableForAppID(app_id(), launcher_controller()->GetProfile()) ==
          AppListControllerDelegate::PIN_EDITABLE;
 }
 
 bool AppShortcutLauncherItemController::ShouldShowTooltip() {
   return true;
 }
 
 content::WebContents* AppShortcutLauncherItemController::GetLRUApplication() {
   URLPattern refocus_pattern(URLPattern::SCHEME_ALL);
   refocus_pattern.SetMatchAllURLs(true);
 
   if (!refocus_url_.is_empty()) {
     refocus_pattern.SetMatchAllURLs(false);
     refocus_pattern.Parse(refocus_url_.spec());
   }
 
   const Extension* extension =
-      launcher_controller()->GetExtensionForAppID(app_id());
+      GetExtensionForAppID(app_id(), launcher_controller()->GetProfile());
 
   // We may get here while the extension is loading (and NULL).
   if (!extension)
     return NULL;
 
   const BrowserList* browser_list = BrowserList::GetInstance();
   for (BrowserList::const_reverse_iterator it =
            browser_list->begin_last_active();
        it != browser_list->end_last_active(); ++it) {
     Browser* browser = *it;
@@ skipping 102 matching lines @@
         }
         return true;
       }
     }
   }
   return false;
 }
 
 bool AppShortcutLauncherItemController::IsV2App() {
   const Extension* extension =
-      launcher_controller()->GetExtensionForAppID(app_id());
+      GetExtensionForAppID(app_id(), launcher_controller()->GetProfile());
   return extension && extension->is_platform_app();
 }
 
 bool AppShortcutLauncherItemController::AllowNextLaunchAttempt() {
   if (last_launch_attempt_.is_null() ||
       last_launch_attempt_ + base::TimeDelta::FromMilliseconds(
           kClickSuppressionInMS) < base::Time::Now()) {
     last_launch_attempt_ = base::Time::Now();
     return true;
   }
   return false;
 }