Shorten several apps-related flags. "256 characters should be enough for anyone's shortcut flags!"

Review URL: http://codereview.chromium.org/1991009

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

3 files changed, 15 insertions, 16 deletions

diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index a3e5df5..1bc4a51 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -41,13 +41,16 @@ const char kAppId[]                         = "app-id";
 const char kAppLaunchAsPanel[]              = "app-launch-as-panel";
 
 // Makes the app launcher popup when a new tab is created.
-const char kAppLauncherForNewTab[]          = "app-launcher-new-tab";
+const char kAppsPanel[]                     = "apps-panel";
 
 // The title to use for the gallery link in the app launcher.
-const char kAppLauncherGalleryTitle[]        = "app-launcher-gallery-title";
+const char kAppsGalleryTitle[]              = "apps-gallery-title";
 
 // The URL to use for the gallery link in the app launcher.
-const char kAppLauncherGalleryURL[]         = "app-launcher-gallery-url";
+const char kAppsGalleryURL[]                = "apps-gallery-url";
+
+// Disable throbber for extension apps.
+const char kAppsNoThrob[]                   = "apps-no-throb";
 
 // Whether to display the "Debug" link for app launch behavior.
 const char kAppsDebug[]      = "apps-debug";
@@ -205,10 +208,6 @@ const char kDisableSyncThemes[]             = "disable-sync-themes";
 // Disable syncing of typed urls.
 const char kDisableSyncTypedUrls[]          = "disable-sync-typed-urls";
 
-// Disable throbber for extension apps.
-const char kDisableThrobberForExtensionApps[] =
-    "disable-throbber-for-extension-apps";
-
 // Enables the backend service for web resources, used in the new tab page for
 // loading tips and recommendations from a JSON feed.
 const char kDisableWebResources[]           = "disable-web-resources";
@@ -245,6 +244,9 @@ const char kDumpHistogramsOnExit[]          = "dump-histograms-on-exit";
 // Enables AeroPeek for each tab. (This switch only works on Windows 7).
 const char kEnableAeroPeekTabs[]            = "enable-aero-peek-tabs";
 
+// Enable experimental extension apps.
+const char kEnableApps[]                    = "enable-apps";
+
 // Enable the inclusion of non-standard ports when generating the Kerberos SPN
 // in response to a Negotiate challenge. See HttpAuthHandlerNegotiate::CreateSPN
 // for more background.
@@ -267,9 +269,6 @@ const char kEnableExperimentalExtensionApis[] =
 // Enable experimental WebGL support.
 const char kEnableExperimentalWebGL[]       = "enable-webgl";
 
-// Enable experimental extension apps.
-const char kEnableExtensionApps[]           = "enable-extension-apps";
-
 // Enable experimental timeline API.
 const char kEnableExtensionTimelineApi[]    = "enable-extension-timeline-api";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index cd969df..ace5638 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -26,10 +26,11 @@ extern const char kAlwaysEnableDevTools[];
 extern const char kApp[];
 extern const char kAppId[];
 extern const char kAppLaunchAsPanel[];
-extern const char kAppLauncherForNewTab[];
-extern const char kAppLauncherGalleryTitle[];
-extern const char kAppLauncherGalleryURL[];
 extern const char kAppsDebug[];
+extern const char kAppsPanel[];
+extern const char kAppsGalleryTitle[];
+extern const char kAppsGalleryURL[];
+extern const char kAppsNoThrob[];
 extern const char kAuthServerWhitelist[];
 extern const char kAutomationClientChannelID[];
 extern const char kBookmarkMenu[];
@@ -74,7 +75,6 @@ extern const char kDisableSyncBookmarks[];
 extern const char kDisableSyncPreferences[];
 extern const char kDisableSyncThemes[];
 extern const char kDisableSyncTypedUrls[];
-extern const char kDisableThrobberForExtensionApps[];
 extern const char kDisableWebResources[];
 extern const char kDisableWebSecurity[];
 extern const char kDisableWebSockets[];
@@ -85,12 +85,12 @@ extern const char kDnsPrefetchDisable[];
 extern const char kDomAutomationController[];
 extern const char kDumpHistogramsOnExit[];
 extern const char kEnableAeroPeekTabs[];
+extern const char kEnableApps[];
 extern const char kEnableAuthNegotiatePort[];
 extern const char kEnableBenchmarking[];
 extern const char kEnableCloudPrintProxy[];
 extern const char kEnableExperimentalExtensionApis[];
 extern const char kEnableExperimentalWebGL[];
-extern const char kEnableExtensionApps[];
 extern const char kEnableExtensionTimelineApi[];
 extern const char kEnableExtensionToolstrips[];
 extern const char kEnableFastback[];
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index 6245a98..db6e934 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -724,7 +724,7 @@ Extension::Extension(const FilePath& path)
   DCHECK(path.IsAbsolute());
 
   apps_enabled_ = CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableExtensionApps);
+      switches::kEnableApps);
   location_ = INVALID;
 
 #if defined(OS_WIN)