| Index: chrome/browser/ui/ash/chrome_launcher_prefs.cc
|
| diff --git a/chrome/browser/ui/ash/chrome_launcher_prefs.cc b/chrome/browser/ui/ash/chrome_launcher_prefs.cc
|
| index 12f0f6a15c9134e2baf1a9961e72bbb6b09a79a8..55bd4152808ced2016b1936ca3e98651eba62ca5 100644
|
| --- a/chrome/browser/ui/ash/chrome_launcher_prefs.cc
|
| +++ b/chrome/browser/ui/ash/chrome_launcher_prefs.cc
|
| @@ -12,6 +12,8 @@
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/values.h"
|
| #include "chrome/browser/app_mode/app_mode_utils.h"
|
| +#include "chrome/browser/chromeos/arc/arc_auth_service.h"
|
| +#include "chrome/browser/chromeos/arc/arc_support_host.h"
|
| #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
|
| #include "chrome/browser/ui/ash/launcher/launcher_controller_helper.h"
|
| #include "chrome/common/extensions/extension_constants.h"
|
| @@ -367,6 +369,11 @@ std::vector<std::string> GetPinnedAppsFromPrefs(
|
| }
|
| }
|
|
|
| + if (arc::ArcAuthService::IsAllowedForProfile(helper->profile()) &&
|
| + helper->IsValidIDForCurrentUser(ArcSupportHost::kHostAppId)) {
|
| + apps.push_back(ArcSupportHost::kHostAppId);
|
| + }
|
| +
|
| // If not added yet, the chrome item will be the last item in the list.
|
| if (!chrome_listed)
|
| apps.push_back(extension_misc::kChromeAppId);
|
|
|