enable apps by default

BUG=none
TEST=run Chrome with no command line flags, apps should be enabled

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

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

9 files changed, 7 insertions, 28 deletions

diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc
index 528c9e4..97cda48 100644
--- a/chrome/browser/browser_browsertest.cc
+++ b/chrome/browser/browser_browsertest.cc
@@ -131,13 +131,6 @@ class BrowserTest : public ExtensionBrowserTest {
   }
 
  protected:
-  virtual void SetUpCommandLine(CommandLine* command_line) {
-    ExtensionBrowserTest::SetUpCommandLine(command_line);
-
-    // Needed for phantom tab tests.
-    command_line->AppendSwitch(switches::kEnableApps);
-  }
-
   // In RTL locales wrap the page title with RTL embedding characters so that it
   // matches the value returned by GetWindowTitle().
   std::wstring LocaleWindowCaptionFromPageTitle(
@@ -624,11 +617,6 @@ class BrowserAppRefocusTest : public ExtensionBrowserTest {
                            profile_(NULL) {}
 
  protected:
-  virtual void SetUpCommandLine(CommandLine* command_line) {
-    ExtensionBrowserTest::SetUpCommandLine(command_line);
-    command_line->AppendSwitch(switches::kEnableApps);
-  }
-
   // Common setup for all tests.  Can't use SetUpInProcessBrowserTestFixture
   // because starting the http server crashes if called from that function.
   // The IO thread is not set up at that point.
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc
index 58615eb..66c8b35 100644
--- a/chrome/browser/browser_init.cc
+++ b/chrome/browser/browser_init.cc
@@ -592,7 +592,7 @@ bool BrowserInit::LaunchWithProfile::IsAppLaunch(std::string* app_url,
       *app_url = command_line_.GetSwitchValueASCII(switches::kApp);
     return true;
   }
-  if (command_line_.HasSwitch(switches::kEnableApps) &&
+  if (!command_line_.HasSwitch(switches::kDisableApps) &&
       command_line_.HasSwitch(switches::kAppId)) {
     if (app_id)
       *app_id = command_line_.GetSwitchValueASCII(switches::kAppId);
diff --git a/chrome/browser/dom_ui/most_visited_handler.cc b/chrome/browser/dom_ui/most_visited_handler.cc
index da59bd8..e6e8ac14 100644
--- a/chrome/browser/dom_ui/most_visited_handler.cc
+++ b/chrome/browser/dom_ui/most_visited_handler.cc
@@ -391,7 +391,7 @@ void MostVisitedHandler::SetPagesValue(std::vector<PageUsageData*>* data) {
   const std::vector<MostVisitedPage> pre_populated_pages =
       MostVisitedHandler::GetPrePopulatedPages();
   bool add_chrome_store =
-      CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableApps) &&
+      !CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableApps) &&
       !HasApps();
 
   while (output_index < kMostVisitedPages) {
diff --git a/chrome/browser/extensions/app_background_page_apitest.cc b/chrome/browser/extensions/app_background_page_apitest.cc
index f16dad3..af4e967 100644
--- a/chrome/browser/extensions/app_background_page_apitest.cc
+++ b/chrome/browser/extensions/app_background_page_apitest.cc
@@ -12,7 +12,6 @@ class AppBackgroundPageApiTest : public ExtensionApiTest {
  public:
   void SetUpCommandLine(CommandLine* command_line) {
     ExtensionApiTest::SetUpCommandLine(command_line);
-    command_line->AppendSwitch(switches::kEnableApps);
     command_line->AppendSwitch(switches::kDisablePopupBlocking);
   }
 };
diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc
index 7cdc80b..e56a756 100644
--- a/chrome/browser/extensions/app_process_apitest.cc
+++ b/chrome/browser/extensions/app_process_apitest.cc
@@ -14,11 +14,6 @@
 #include "net/base/mock_host_resolver.h"
 
 class AppApiTest : public ExtensionApiTest {
- public:
-  void SetUpCommandLine(CommandLine* command_line) {
-    ExtensionApiTest::SetUpCommandLine(command_line);
-    command_line->AppendSwitch(switches::kEnableApps);
-  }
 };
 
 // Simulates a page calling window.open on an URL, and waits for the navigation.
diff --git a/chrome/browser/extensions/extensions_service_unittest.cc b/chrome/browser/extensions/extensions_service_unittest.cc
index 5dc2def..27a57c2 100644
--- a/chrome/browser/extensions/extensions_service_unittest.cc
+++ b/chrome/browser/extensions/extensions_service_unittest.cc
@@ -248,8 +248,6 @@ void ExtensionsServiceTestBase::InitializeExtensionsService(
   // when the prefs are registered.
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableExtensionToolstrips);
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kEnableApps);
 
   ExtensionTestingProfile* profile = new ExtensionTestingProfile();
   // Create a preference service that only contains user defined
diff --git a/chrome/browser/history/top_sites.cc b/chrome/browser/history/top_sites.cc
index 2e4fbb0..7d8c66a 100644
--- a/chrome/browser/history/top_sites.cc
+++ b/chrome/browser/history/top_sites.cc
@@ -287,7 +287,7 @@ int TopSites::GetIndexForChromeStore(const MostVisitedURLList& urls) {
 }
 
 bool TopSites::AddChromeStore(MostVisitedURLList* urls) {
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableApps))
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableApps))
     return false;
 
   ExtensionsService* service = profile_->GetExtensionsService();
diff --git a/chrome/browser/shell_integration.cc b/chrome/browser/shell_integration.cc
index 49c311e..1c54eca 100644
--- a/chrome/browser/shell_integration.cc
+++ b/chrome/browser/shell_integration.cc
@@ -42,10 +42,9 @@ std::string ShellIntegration::GetCommandLineArgumentsCommon(const GURL& url,
   // If |extension_app_id| is present, we use the kAppId switch rather than
   // the kApp switch (the launch url will be read from the extension app
   // during launch.
-  if (cmd.HasSwitch(switches::kEnableApps) && !extension_app_id.empty()) {
+  if (!cmd.HasSwitch(switches::kDisableApps) && !extension_app_id.empty()) {
     arguments_w += std::wstring(L"--") + ASCIIToWide(switches::kAppId) +
-        L"=\"" + ASCIIToWide(UTF16ToASCII(extension_app_id)) + L"\" --" +
-        ASCIIToWide(switches::kEnableApps);
+        L"=\"" + ASCIIToWide(UTF16ToASCII(extension_app_id));
   } else {
     // Use '--app=url' instead of just 'url' to launch the browser with minimal
     // chrome.
diff --git a/chrome/browser/utility_process_host.cc b/chrome/browser/utility_process_host.cc
index 4e3852f..7b6772e 100644
--- a/chrome/browser/utility_process_host.cc
+++ b/chrome/browser/utility_process_host.cc
@@ -90,8 +90,8 @@ bool UtilityProcessHost::StartProcess(const FilePath& exposed_dir) {
   if (browser_command_line.HasSwitch(switches::kChromeFrame))
     cmd_line->AppendSwitch(switches::kChromeFrame);
 
-  if (browser_command_line.HasSwitch(switches::kEnableApps))
-    cmd_line->AppendSwitch(switches::kEnableApps);
+  if (browser_command_line.HasSwitch(switches::kDisableApps))
+    cmd_line->AppendSwitch(switches::kDisableApps);
 
   if (browser_command_line.HasSwitch(
       switches::kEnableExperimentalExtensionApis)) {