Implement new strategy for default apps

chrome/browser/shell_integration.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/shell_integration.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
@@ skipping 24 matching lines @@
   FilePath profile = cmd.GetSwitchValuePath(switches::kLoginProfile);
   if (!profile.empty()) {
     arguments_w += std::wstring(L"--") + ASCIIToWide(switches::kLoginProfile) +
         L"=\"" + profile.ToWStringHack() + L"\" ";
   }
 #endif
 
   // 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::kDisableApps) && !extension_app_id.empty()) {
+  if (!extension_app_id.empty()) {
     arguments_w += std::wstring(L"--") + ASCIIToWide(switches::kAppId) +
         L"=\"" + ASCIIToWide(UTF16ToASCII(extension_app_id));
   } else {
     // Use '--app=url' instead of just 'url' to launch the browser with minimal
     // chrome.
     // Note: Do not change this flag!  Old Gears shortcuts will break if you do!
     std::string url_string = url.spec();
     ReplaceSubstringsAfterOffset(&url_string, 0, "\\", "%5C");
     ReplaceSubstringsAfterOffset(&url_string, 0, "\"", "%22");
     ReplaceSubstringsAfterOffset(&url_string, 0, ";",  "%3B");
@@ skipping 85 matching lines @@
         observer_->SetDefaultBrowserUIState(STATE_IS_DEFAULT);
         break;
       case UNKNOWN_DEFAULT_BROWSER:
         observer_->SetDefaultBrowserUIState(STATE_UNKNOWN);
         break;
       default:
         break;
     }
   }
 }