| Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
|
| diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
|
| index 3dcfad209381d3bf107ba0a4f9d117c120ac5267..d0c3e2391e494c2443ec62f00fa9e60738449522 100644
|
| --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
|
| +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
|
| @@ -34,6 +34,7 @@
|
| #include "ui/aura/window_observer.h"
|
|
|
| class AppSyncUIState;
|
| +class AppTabHelper;
|
| class Browser;
|
| class BrowserShortcutLauncherItemController;
|
| class BrowserStatusMonitor;
|
| @@ -106,25 +107,6 @@ class ChromeLauncherController
|
| APP_STATE_REMOVED
|
| };
|
|
|
| - // Mockable interface to get app ids from tabs.
|
| - class AppTabHelper {
|
| - public:
|
| - virtual ~AppTabHelper() {}
|
| -
|
| - // Returns the app id of the specified tab, or an empty string if there is
|
| - // no app. All known profiles will be queried for this.
|
| - virtual std::string GetAppID(content::WebContents* tab) = 0;
|
| -
|
| - // Returns true if |id| is valid for the currently active profile.
|
| - // Used during restore to ignore no longer valid extensions.
|
| - // Note that already running applications are ignored by the restore
|
| - // process.
|
| - virtual bool IsValidIDForCurrentUser(const std::string& id) = 0;
|
| -
|
| - // Sets the currently active profile for the usage of |GetAppID|.
|
| - virtual void SetCurrentUser(Profile* profile) = 0;
|
| - };
|
| -
|
| ChromeLauncherController(Profile* profile, ash::ShelfModel* model);
|
| ~ChromeLauncherController() override;
|
|
|
| @@ -483,9 +465,6 @@ class ChromeLauncherController
|
| // Update browser shortcut's index.
|
| void PersistChromeItemIndex(int index);
|
|
|
| - // Get browser shortcut's index from pref.
|
| - int GetChromeIconIndexFromPref() const;
|
| -
|
| // Depending on the provided flags, move either the chrome icon, the app icon
|
| // or none to the given |target_index|. The provided |chrome_index| and
|
| // |app_list_index| locations will get adjusted within this call to finalize
|
| @@ -505,9 +484,6 @@ class ChromeLauncherController
|
| // configuration of pinned and known (but not running) apps.
|
| int GetChromeIconIndexForCreation();
|
|
|
| - // Get the list of pinned programs from the preferences.
|
| - std::vector<std::string> GetListOfPinnedAppsAndBrowser();
|
| -
|
| // Close all windowed V1 applications of a certain extension which was already
|
| // deleted.
|
| void CloseWindowedAppsFromRemovedExtension(const std::string& app_id,
|
| @@ -549,7 +525,7 @@ class ChromeLauncherController
|
| // Used to get app info for tabs.
|
| std::unique_ptr<AppTabHelper> app_tab_helper_;
|
|
|
| - // Used to load the image for an extension app item.
|
| + // Used to load the images for app items.
|
| std::vector<std::unique_ptr<AppIconLoader>> app_icon_loaders_;
|
|
|
| // Used to handle app load/unload events.
|
|
|