Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1105)

Unified Diff: chrome/browser/apps/custom_launcher_page_browsertest_views.cc

Issue 475543004: Added 'launcher_page' field to extension manifest.json format. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Formatting. Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/app_list/app_list_view_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/apps/custom_launcher_page_browsertest_views.cc
diff --git a/chrome/browser/apps/custom_launcher_page_browsertest_views.cc b/chrome/browser/apps/custom_launcher_page_browsertest_views.cc
index 667244c7210bd0b1809b6366b9f14d3d22b3d01b..ac4c0ebf68d024719acdc31ff1bbc6969822d5fe 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
« no previous file with comments | « no previous file | chrome/browser/ui/app_list/app_list_view_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698