Re-land r47079: Shorten several appsrelated flags.

TBR=rafaelw@chromium.org

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

3 files changed, 5 insertions, 8 deletions

diff --git a/chrome/browser/dom_ui/app_launcher_handler.cc b/chrome/browser/dom_ui/app_launcher_handler.cc
index 8470f6b..2726cf6 100644
--- a/chrome/browser/dom_ui/app_launcher_handler.cc
+++ b/chrome/browser/dom_ui/app_launcher_handler.cc
@@ -89,9 +89,9 @@ void AppLauncherHandler::HandleGetApps(const Value* value) {
 
   // TODO(aa): Decide the final values for these and remove the switches.
   gallery_title = CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-      switches::kAppLauncherGalleryTitle);
+      switches::kAppsGalleryTitle);
   gallery_url = CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-      switches::kAppLauncherGalleryURL);
+      switches::kAppsGalleryURL);
   bool show_debug_link = CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kAppsDebug);
 
diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc
index 39a2289..693618e 100644
--- a/chrome/browser/dom_ui/new_tab_ui.cc
+++ b/chrome/browser/dom_ui/new_tab_ui.cc
@@ -505,8 +505,7 @@ NewTabUI::NewTabUI(TabContents* contents)
     if (ProfileSyncService::IsSyncEnabled()) {
       AddMessageHandler((new NewTabPageSyncHandler())->Attach(this));
     }
-    if (CommandLine::ForCurrentProcess()->HasSwitch(
-            switches::kEnableExtensionApps)) {
+    if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableApps)) {
       ExtensionsService* service = GetProfile()->GetExtensionsService();
       AddMessageHandler((new AppLauncherHandler(service))->Attach(this));
     }
diff --git a/chrome/browser/dom_ui/shown_sections_handler.cc b/chrome/browser/dom_ui/shown_sections_handler.cc
index 9b47274..501c1d8 100644
--- a/chrome/browser/dom_ui/shown_sections_handler.cc
+++ b/chrome/browser/dom_ui/shown_sections_handler.cc
@@ -87,8 +87,7 @@ void ShownSectionsHandler::SetFirstAppLauncherRunPref(
   // If we have turned on Apps we want to hide most visited and recent to give
   // more focus to the Apps section. We do not do this in MigrateUserPrefs
   // because the pref version should not depend on command line switches.
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableExtensionApps) &&
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableApps) &&
       !pref_service->GetBoolean(prefs::kNTPAppLauncherFirstRun)) {
     int sections = pref_service->GetInteger(prefs::kNTPShownSections);
     sections &= ~THUMB;
@@ -102,8 +101,7 @@ void ShownSectionsHandler::SetFirstAppLauncherRunPref(
 void ShownSectionsHandler::RegisterUserPrefs(PrefService* pref_service) {
   pref_service->RegisterIntegerPref(prefs::kNTPShownSections,
                                     THUMB | RECENT | TIPS | SYNC);
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableExtensionApps)) {
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableApps)) {
     pref_service->RegisterBooleanPref(prefs::kNTPAppLauncherFirstRun, false);
   }
 }