Commit 9362bcbe authored by calamity's avatar calamity Committed by Commit bot

Move --custom-launcher-page switch into app_list_switches.h.

This CL moves the --custom-launcher-page switch into app_list_switches.h
because it probably belongs there with the other app list related
switches.

BUG=416756

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

Cr-Commit-Position: refs/heads/master@{#297373}
parent 4ed84143
...@@ -116,9 +116,9 @@ void GetCustomLauncherPageUrls(content::BrowserContext* browser_context, ...@@ -116,9 +116,9 @@ void GetCustomLauncherPageUrls(content::BrowserContext* browser_context,
// First, check the command line. // First, check the command line.
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
if (app_list::switches::IsExperimentalAppListEnabled() && if (app_list::switches::IsExperimentalAppListEnabled() &&
command_line->HasSwitch(switches::kCustomLauncherPage)) { command_line->HasSwitch(app_list::switches::kCustomLauncherPage)) {
GURL custom_launcher_page_url( GURL custom_launcher_page_url(command_line->GetSwitchValueASCII(
command_line->GetSwitchValueASCII(switches::kCustomLauncherPage)); app_list::switches::kCustomLauncherPage));
if (custom_launcher_page_url.SchemeIs(extensions::kExtensionScheme)) { if (custom_launcher_page_url.SchemeIs(extensions::kExtensionScheme)) {
urls->push_back(custom_launcher_page_url); urls->push_back(custom_launcher_page_url);
......
...@@ -187,10 +187,6 @@ const char kCrashOnHangThreads[] = "crash-on-hang-threads"; ...@@ -187,10 +187,6 @@ const char kCrashOnHangThreads[] = "crash-on-hang-threads";
const char kCreateBrowserOnStartupForTests[] = const char kCreateBrowserOnStartupForTests[] =
"create-browser-on-startup-for-tests"; "create-browser-on-startup-for-tests";
// Specifies the chrome-extension:// URL for the contents of an additional page
// added to the experimental app launcher.
const char kCustomLauncherPage[] = "custom-launcher-page";
// Enables a frame context menu item that toggles the frame in and out of glass // Enables a frame context menu item that toggles the frame in and out of glass
// mode (Windows Vista and up only). // mode (Windows Vista and up only).
const char kDebugEnableFrameToggle[] = "debug-enable-frame-toggle"; const char kDebugEnableFrameToggle[] = "debug-enable-frame-toggle";
......
...@@ -60,7 +60,6 @@ extern const char kCloudPrintPrintTicket[]; ...@@ -60,7 +60,6 @@ extern const char kCloudPrintPrintTicket[];
extern const char kCloudPrintSetupProxy[]; extern const char kCloudPrintSetupProxy[];
extern const char kCrashOnHangThreads[]; extern const char kCrashOnHangThreads[];
extern const char kCreateBrowserOnStartupForTests[]; extern const char kCreateBrowserOnStartupForTests[];
extern const char kCustomLauncherPage[];
extern const char kDebugEnableFrameToggle[]; extern const char kDebugEnableFrameToggle[];
extern const char kDebugPackedApps[]; extern const char kDebugPackedApps[];
extern const char kDiagnostics[]; extern const char kDiagnostics[];
......
...@@ -9,6 +9,10 @@ ...@@ -9,6 +9,10 @@
namespace app_list { namespace app_list {
namespace switches { namespace switches {
// Specifies the chrome-extension:// URL for the contents of an additional page
// added to the experimental app launcher.
const char kCustomLauncherPage[] = "custom-launcher-page";
// If set, the app info context menu item is not available in the app list UI. // If set, the app info context menu item is not available in the app list UI.
const char kDisableAppInfo[] = "disable-app-list-app-info"; const char kDisableAppInfo[] = "disable-app-list-app-info";
......
...@@ -11,6 +11,7 @@ namespace app_list { ...@@ -11,6 +11,7 @@ namespace app_list {
namespace switches { namespace switches {
// Please keep these flags sorted. // Please keep these flags sorted.
APP_LIST_EXPORT extern const char kCustomLauncherPage[];
APP_LIST_EXPORT extern const char kDisableAppInfo[]; APP_LIST_EXPORT extern const char kDisableAppInfo[];
APP_LIST_EXPORT extern const char kDisableDriveAppsInAppList[]; APP_LIST_EXPORT extern const char kDisableDriveAppsInAppList[];
APP_LIST_EXPORT extern const char kDisableSyncAppList[]; APP_LIST_EXPORT extern const char kDisableSyncAppList[];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment