Revert 44712 - Merge the enableapplauncher flag with the enable

extensionapps flag since we will be using them together.

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

TBR=aa@chromium.org
Review URL: http://codereview.chromium.org/1654015

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

4 files changed, 6 insertions, 2 deletions

diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index a147a90..8772248 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -1063,7 +1063,7 @@ void Browser::NewTab() {
   UserMetrics::RecordAction(UserMetricsAction("NewTab"), profile_);
 #if defined(OS_WIN)
   if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableExtensionApps)) {
+      switches::kAppLauncherForNewTab)) {
     AppLauncher::ShowForNewTab(this);
     return;
   }
diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc
index a974b1f..56bf512 100644
--- a/chrome/browser/views/tabs/tab_strip.cc
+++ b/chrome/browser/views/tabs/tab_strip.cc
@@ -937,7 +937,7 @@ void TabStrip::ButtonPressed(views::Button* sender, const views::Event& event) {
     //                behavior for the new tab button, we should add a method
     //                on the TabStripDelegate to do so.
     if (CommandLine::ForCurrentProcess()->HasSwitch(
-        switches::kEnableExtensionApps)) {
+        switches::kAppLauncherForNewTab)) {
       NavigationController& controller =
           model_->GetSelectedTabContents()->controller();
       AppLauncher::ShowForNewTab(Browser::GetBrowserForController(&controller,
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 365ba91..9c6a41f 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -40,6 +40,9 @@ const char kAppId[]                         = "app-id";
 // panel window.
 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";
+
 // Authentication white list for servers
 const char kAuthServerWhitelist[]           = "auth-server-whitelist";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index a8ee599a..7de456a 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -26,6 +26,7 @@ extern const char kAlwaysEnableDevTools[];
 extern const char kApp[];
 extern const char kAppId[];
 extern const char kAppLaunchAsPanel[];
+extern const char kAppLauncherForNewTab[];
 extern const char kAuthServerWhitelist[];
 extern const char kAutomationClientChannelID[];
 extern const char kBookmarkMenu[];