Don't add default apps for non-standard profiles

On Chrome OS, such profiles include the Lock Screen App Profile and the
Sign-in Profile.

Change-Id: Ia373979d377e3b11729ca1036f4f8d12dc824271
Reviewed-on: https://chromium-review.googlesource.com/1166265
Commit-Queue: Nigel Tao <nigeltao@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#584965}

chrome/browser/web_applications/bookmark_apps/external_web_apps.cc

@@ -19,6 +19,10 @@
 #include "content/public/browser/browser_thread.h"
 #include "url/gurl.h"
 
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/profiles/profile_helper.h"
+#endif
+
 namespace {
 
 constexpr char kWebAppManifestUrl[] = "web_app_manifest_url";
@@ -81,6 +85,34 @@ std::vector<web_app::PendingAppManager::AppInfo> ScanDir(base::FilePath dir) {
   return app_infos;
 }
 
+base::FilePath DetermineScanDir(Profile* profile) {
+  base::FilePath dir;
+#if defined(OS_CHROMEOS)
+  // As of mid 2018, only Chrome OS has default/external web apps, and
+  // chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS is only defined for OS_LINUX,
+  // which includes OS_CHROMEOS.
+
+  if (chromeos::ProfileHelper::IsPrimaryProfile(profile)) {
+    // For manual testing, you can change s/STANDALONE/USER/, as writing to
+    // "$HOME/.config/chromium/test-user/.config/chromium/External Extensions"
+    // does not require root ACLs, unlike "/usr/share/chromium/extensions".
+    //
+    // TODO(nigeltao): do we want to append a sub-directory name, analogous to
+    // the "arc" in "/usr/share/chromium/extensions/arc" as per
+    // chrome/browser/ui/app_list/arc/arc_default_app_list.cc? Or should we not
+    // sort "system apps" into directories based on their platform (e.g. ARC,
+    // PWA, etc.), and instead examine the JSON contents (e.g. an "activity"
+    // key means ARC, "web_app_start_url" key means PWA, etc.)?
+    if (!base::PathService::Get(chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS,
+                                &dir)) {
+      LOG(ERROR) << "ScanForExternalWebApps: base::PathService::Get failed";
+    }
+  }
+
+#endif
+  return dir;
+}
+
 }  // namespace
 
 namespace web_app {
@@ -90,49 +122,28 @@ ScanDirForExternalWebAppsForTesting(base::FilePath dir) {
   return ScanDir(dir);
 }
 
-void ScanForExternalWebApps(ScanForExternalWebAppsCallback callback) {
+void ScanForExternalWebApps(Profile* profile,
+                            ScanForExternalWebAppsCallback callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-#if !defined(OS_CHROMEOS)
-  // As of mid 2018, only Chrome OS has default/external web apps, and
-  // chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS is only defined for OS_LINUX,
-  // which includes OS_CHROMEOS.
-  //
-  // In the future we may have default/external web apps for other platforms,
-  // but for now run the callback with an empty vector.
-  std::move(callback).Run(std::vector<web_app::PendingAppManager::AppInfo>());
-#else
-  // For manual testing, it can be useful to s/STANDALONE/USER/, as writing to
-  // "$HOME/.config/chromium/test-user/.config/chromium/External Extensions"
-  // does not require root ACLs, unlike "/usr/share/chromium/extensions".
-  //
-  // TODO(nigeltao): do we want to append a sub-directory name, analogous to
-  // the "arc" in "/usr/share/chromium/extensions/arc" as per
-  // chrome/browser/ui/app_list/arc/arc_default_app_list.cc? Or should we not
-  // sort "system apps" into directories based on their platform (e.g. ARC,
-  // PWA, etc.), and instead examine the JSON contents (e.g. an "activity"
-  // key means ARC, "web_app_start_url" key means PWA, etc.)?
-  base::FilePath dir;
-  if (!base::PathService::Get(chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS,
-                              &dir)) {
-    LOG(ERROR) << "ScanForExternalWebApps: base::PathService::Get failed";
-    return;
+  base::FilePath dir = DetermineScanDir(profile);
+  if (dir.empty()) {
+    std::move(callback).Run(std::vector<web_app::PendingAppManager::AppInfo>());
+  } else {
+    // Do a two-part callback dance, across different TaskRunners.
+    //
+    // 1. Schedule ScanDir to happen on a background thread, so that we don't
+    // block the UI thread. When that's done,
+    // base::PostTaskWithTraitsAndReplyWithResult will bounce us back to the
+    // originating thread (the UI thread).
+    //
+    // 2. In |callback|, forward the vector of AppInfo's on to the
+    // pending_app_manager_, which can only be called on the UI thread.
+    base::PostTaskWithTraitsAndReplyWithResult(
+        FROM_HERE,
+        {base::MayBlock(), base::TaskPriority::BEST_EFFORT,
+         base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN},
+        base::BindOnce(&ScanDir, dir), std::move(callback));
   }
-
-  // Do a two-part callback dance, across different TaskRunners.
-  //
-  // 1. Schedule ScanDir to happen on a background thread, so that we don't
-  // block the UI thread. When that's done
-  // , base::PostTaskWithTraitsAndReplyWithResult will bounce us back to the
-  // originating thread (the UI thread).
-  //
-  // 2. In |callback|, forward the vector of AppInfo's on to the
-  // pending_app_manager_, which can only be called on the UI thread.
-  base::PostTaskWithTraitsAndReplyWithResult(
-      FROM_HERE,
-      {base::MayBlock(), base::TaskPriority::BEST_EFFORT,
-       base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN},
-      base::BindOnce(&ScanDir, dir), std::move(callback));
-#endif
 }
 
 }  //  namespace web_app

chrome/browser/web_applications/bookmark_apps/external_web_apps.h

@@ -11,12 +11,15 @@
 #include "base/files/file_path.h"
 #include "chrome/browser/web_applications/components/pending_app_manager.h"
 
+class Profile;
+
 namespace web_app {
 
 using ScanForExternalWebAppsCallback =
     base::OnceCallback<void(std::vector<web_app::PendingAppManager::AppInfo>)>;
 
-void ScanForExternalWebApps(ScanForExternalWebAppsCallback callback);
+void ScanForExternalWebApps(Profile* profile,
+                            ScanForExternalWebAppsCallback callback);
 
 // Scans the given directory (non-recursively) for *.json files that define
 // "external web apps", the Web App analogs of "external extensions", described

chrome/browser/web_applications/web_app_provider.cc

@@ -27,8 +27,8 @@ WebAppProvider::WebAppProvider(Profile* profile)
           std::make_unique<WebAppPolicyManager>(profile->GetPrefs(),
                                                 pending_app_manager_.get())) {
   web_app::ScanForExternalWebApps(
-      base::BindOnce(&WebAppProvider::OnScanForExternalWebApps,
-                     weak_ptr_factory_.GetWeakPtr()));
+      profile, base::BindOnce(&WebAppProvider::OnScanForExternalWebApps,
+                              weak_ptr_factory_.GetWeakPtr()));
 }
 
 WebAppProvider::~WebAppProvider() = default;