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 a0ac9767d6363f70a0bf07706699d00dc3e0e6d0..bca3ef14cff6bf5b5e31abb0e81f135554e86044 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" |
@@ -368,6 +370,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); |