Added 'launcher_page' field to extension manifest.json format.

Adds a new manifest section which allows extensions (currently, only
platform apps) to provide a page in the experimental app launcher, eg:

  "launcher_page": {
    "page": "index.html"
  }

All installed apps with a valid launcher_page section will be given a
page in the launcher.

This feature is currently only available on dev channel and whitelisted
(currently to a few testing apps; this list will expand in the future,
and can be overridden with --whitelisted-extension-id=ID).

Updated CustomLauncherPageBrowserTest to use its manifest to install the
launcher page, rather than using --custom-launcher-page.

BUG=399131,404000

Review URL: https://codereview.chromium.org/475543004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289931 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 6 deletions

diff --git a/chrome/browser/apps/custom_launcher_page_browsertest_views.cc b/chrome/browser/apps/custom_launcher_page_browsertest_views.cc
index 667244c..ac4c0eb 100644
--- a/chrome/browser/apps/custom_launcher_page_browsertest_views.cc
+++ b/chrome/browser/apps/custom_launcher_page_browsertest_views.cc
@@ -7,8 +7,8 @@
 #include "base/command_line.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/ui/app_list/app_list_service.h"
-#include "chrome/common/chrome_switches.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/switches.h"
 #include "ui/app_list/app_list_switches.h"
 
 namespace {
@@ -16,9 +16,8 @@ namespace {
 // The path of the test application within the "platform_apps" directory.
 const char kCustomLauncherPagePath[] = "custom_launcher_page";
 
-// The app ID and URL of the test application.
-const char kCustomLauncherPageUrl[] =
-    "chrome-extension://lmadimbbgapmngbiclpjjngmdickadpl/main.html";
+// The app ID of the test application.
+const char kCustomLauncherPageID[] = "lmadimbbgapmngbiclpjjngmdickadpl";
 
 }  // namespace
 
@@ -36,8 +35,10 @@ class CustomLauncherPageBrowserTest
 
     // Custom launcher pages only work in the experimental app list.
     command_line->AppendSwitch(app_list::switches::kEnableExperimentalAppList);
-    command_line->AppendSwitchASCII(switches::kCustomLauncherPage,
-                                    kCustomLauncherPageUrl);
+
+    // The test app must be whitelisted to use launcher_page.
+    command_line->AppendSwitchASCII(
+        extensions::switches::kWhitelistedExtensionID, kCustomLauncherPageID);
   }
 
   // Open the launcher. Ignores the Extension argument (this will simply