remove --enable-experimental-extension-apis from packaged app shortcut args

chrome/browser/shell_integration.cc

 // Copyright (c) 2012 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/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 ShellIntegration::DefaultWebClientSetPermission
     ShellIntegration::CanSetAsDefaultProtocolClient() {
   // Allowed as long as the browser can become the operating system default
   // browser.
   return CanSetAsDefaultBrowser();
 }
 
 ShellIntegration::ShortcutInfo::ShortcutInfo()
-    : is_platform_app(false),
-      create_on_desktop(false),
+    : create_on_desktop(false),
       create_in_applications_menu(false),
       create_in_quick_launch_bar(false) {
 }
 
 ShellIntegration::ShortcutInfo::~ShortcutInfo() {}
 
 static const struct ShellIntegration::AppModeInfo* gAppModeInfo = NULL;
 
 // static
 void ShellIntegration::SetAppModeInfo(const struct AppModeInfo* info) {
   gAppModeInfo = info;
 }
 
 // static
 const struct ShellIntegration::AppModeInfo* ShellIntegration::AppModeInfo() {
   return gAppModeInfo;
 }
 
 // static
 bool ShellIntegration::IsRunningInAppMode() {
   return gAppModeInfo != NULL;
 }
 
 // static
 CommandLine ShellIntegration::CommandLineArgsForLauncher(
     const GURL& url,
     const std::string& extension_app_id,
-    bool is_platform_app,
     const FilePath& profile_path) {
   const CommandLine& cmd_line = *CommandLine::ForCurrentProcess();
   CommandLine new_cmd_line(CommandLine::NO_PROGRAM);
 
   // Use the same UserDataDir for new launches that we currently have set.
   FilePath user_data_dir = cmd_line.GetSwitchValuePath(switches::kUserDataDir);
   if (!user_data_dir.empty()) {
     // Make sure user_data_dir is an absolute path.
     if (file_util::AbsolutePath(&user_data_dir) &&
         file_util::PathExists(user_data_dir)) {
       new_cmd_line.AppendSwitchPath(switches::kUserDataDir, user_data_dir);
     }
   }
 
 #if defined(OS_CHROMEOS)
   FilePath profile = cmd_line.GetSwitchValuePath(switches::kLoginProfile);
   if (!profile.empty())
     new_cmd_line.AppendSwitchPath(switches::kLoginProfile, profile);
 #else
   if (!profile_path.empty() && !extension_app_id.empty())
     new_cmd_line.AppendSwitchPath(switches::kProfileDirectory,
                                   profile_path.BaseName());
 #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 (!extension_app_id.empty()) {
     new_cmd_line.AppendSwitchASCII(switches::kAppId, extension_app_id);
-    if (is_platform_app)
-      new_cmd_line.AppendSwitch(switches::kEnableExperimentalExtensionApis);
   } 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!
     new_cmd_line.AppendSwitchASCII(switches::kApp, url.spec());
   }
   return new_cmd_line;
 }
 
 #if !defined(OS_WIN)
@@ skipping 163 matching lines @@
 
 ShellIntegration::DefaultWebClientState
 ShellIntegration::DefaultProtocolClientWorker::CheckIsDefault() {
   return ShellIntegration::IsDefaultProtocolClient(protocol_);
 }
 
 bool ShellIntegration::DefaultProtocolClientWorker::SetAsDefault(
     bool interactive_permitted) {
   return ShellIntegration::SetAsDefaultProtocolClient(protocol_);
 }