9 files changed, 4 insertions, 21 deletions
diff --git a/chrome/browser/extensions/app_shortcut_manager.cc b/chrome/browser/extensions/app_shortcut_manager.cc
index 40b0c87..e1f5f5d 100644
--- a/chrome/browser/extensions/app_shortcut_manager.cc
+++ b/chrome/browser/extensions/app_shortcut_manager.cc
@@ -38,7 +38,6 @@ ShellIntegration::ShortcutInfo ShortcutInfoForExtensionAndProfile(
   shortcut_info.title = UTF8ToUTF16(extension->name());
   shortcut_info.description = UTF8ToUTF16(extension->description());
   shortcut_info.extension_path = extension->path();
-  shortcut_info.is_platform_app = extension->is_platform_app();
   shortcut_info.create_in_applications_menu = true;
   shortcut_info.create_in_quick_launch_bar = true;
   shortcut_info.create_on_desktop = true;
diff --git a/chrome/browser/shell_integration.cc b/chrome/browser/shell_integration.cc
index 519ded7..08a9684 100644
--- a/chrome/browser/shell_integration.cc
+++ b/chrome/browser/shell_integration.cc
@@ -26,8 +26,7 @@ ShellIntegration::DefaultWebClientSetPermission
 }
 
 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) {
 }
@@ -55,7 +54,6 @@ bool ShellIntegration::IsRunningInAppMode() {
 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);
@@ -85,8 +83,6 @@ CommandLine ShellIntegration::CommandLineArgsForLauncher(
   // 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.
diff --git a/chrome/browser/shell_integration.h b/chrome/browser/shell_integration.h
index 9eb9b37..55ddfcf 100644
--- a/chrome/browser/shell_integration.h
+++ b/chrome/browser/shell_integration.h
@@ -89,9 +89,6 @@ class ShellIntegration {
     gfx::Image favicon;
     FilePath profile_path;
 
-    // Shortcuts to platform apps are created differently. They start up with
-    // their own user data directory and load the app from |extension_path|.
-    bool is_platform_app;
     bool create_on_desktop;
     bool create_in_applications_menu;
 
@@ -115,12 +112,10 @@ class ShellIntegration {
   // The new command line reuses the current process's user data directory (and
   // login profile, for ChromeOS).
   // If |extension_app_id| is non-empty, the arguments use kAppId=<id>.
-  // Otherwise, kApp=<url> is used. If |is_platform_app| is true the flag
-  // --enable-platform-apps is added to the command line.
+  // Otherwise, kApp=<url> is used.
   static CommandLine CommandLineArgsForLauncher(
       const GURL& url,
       const std::string& extension_app_id,
-      bool is_platform_app,
       const FilePath& profile_path);
 
 #if defined(OS_WIN)
diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc
index ea05095..b4f7942 100644
--- a/chrome/browser/shell_integration_linux.cc
+++ b/chrome/browser/shell_integration_linux.cc
@@ -520,7 +520,6 @@ std::string GetDesktopFileContents(
     const std::string& app_name,
     const GURL& url,
     const std::string& extension_id,
-    const bool is_platform_app,
     const FilePath& extension_path,
     const string16& title,
     const std::string& icon_name,
@@ -589,7 +588,7 @@ std::string GetDesktopFileContents(
     }
     CommandLine cmd_line(CommandLine::NO_PROGRAM);
     cmd_line = ShellIntegration::CommandLineArgsForLauncher(
-        url, extension_id, is_platform_app, profile_path);
+        url, extension_id, profile_path);
     const CommandLine::SwitchMap& switch_map = cmd_line.GetSwitches();
     for (CommandLine::SwitchMap::const_iterator i = switch_map.begin();
          i != switch_map.end(); ++i) {
@@ -658,7 +657,6 @@ bool CreateDesktopShortcut(
       app_name,
       shortcut_info.url,
       shortcut_info.extension_id,
-      shortcut_info.is_platform_app,
       shortcut_info.extension_path,
       shortcut_info.title,
       icon_name,
diff --git a/chrome/browser/shell_integration_linux.h b/chrome/browser/shell_integration_linux.h
index 6918910..e1c9fba 100644
--- a/chrome/browser/shell_integration_linux.h
+++ b/chrome/browser/shell_integration_linux.h
@@ -39,7 +39,6 @@ std::string GetDesktopFileContents(const std::string& template_contents,
                                    const std::string& app_name,
                                    const GURL& url,
                                    const std::string& extension_id,
-                                   const bool is_platform_app,
                                    const FilePath& extension_path,
                                    const string16& title,
                                    const std::string& icon_name,
diff --git a/chrome/browser/shell_integration_unittest.cc b/chrome/browser/shell_integration_unittest.cc
index 31ea4a3..f5b2db0 100644
--- a/chrome/browser/shell_integration_unittest.cc
+++ b/chrome/browser/shell_integration_unittest.cc
@@ -358,7 +358,6 @@ TEST(ShellIntegrationTest, GetDesktopFileContents) {
             web_app::GenerateApplicationNameFromURL(GURL(test_cases[i].url)),
             GURL(test_cases[i].url),
             "",
-            false,
             FilePath(),
             ASCIIToUTF16(test_cases[i].title),
             test_cases[i].icon_name,
diff --git a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc
index 63db89f..596b6bf 100644
--- a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc
+++ b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc
@@ -324,7 +324,6 @@ CreateChromeApplicationShortcutsDialogGtk::
   // Get shortcut information now, it's needed for our UI.
   shortcut_info_.extension_id = app_->id();
   shortcut_info_.extension_path = app_->path();
-  shortcut_info_.is_platform_app = app_->is_platform_app();
   shortcut_info_.url = GURL(app_->launch_web_url());
   shortcut_info_.title = UTF8ToUTF16(app_->name());
   shortcut_info_.description = UTF8ToUTF16(app_->description());
diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc
index c80a6fe..8c2b8d6 100644
--- a/chrome/browser/ui/views/create_application_shortcut_view.cc
+++ b/chrome/browser/ui/views/create_application_shortcut_view.cc
@@ -493,7 +493,6 @@ CreateChromeApplicationShortcutView::CreateChromeApplicationShortcutView(
   shortcut_info_.url = GURL(app_->launch_web_url());
   shortcut_info_.title = UTF8ToUTF16(app_->name());
   shortcut_info_.description = UTF8ToUTF16(app_->description());
-  shortcut_info_.is_platform_app = app_->is_platform_app();
   shortcut_info_.extension_path = app_->path();
   shortcut_info_.profile_path = profile->GetPath();
 
diff --git a/chrome/browser/web_applications/web_app_win.cc b/chrome/browser/web_applications/web_app_win.cc
index 8bf3b8f..b1aca7d 100644
--- a/chrome/browser/web_applications/web_app_win.cc
+++ b/chrome/browser/web_applications/web_app_win.cc
@@ -233,8 +233,7 @@ bool CreatePlatformShortcuts(
 
   CommandLine cmd_line(CommandLine::NO_PROGRAM);
   cmd_line = ShellIntegration::CommandLineArgsForLauncher(shortcut_info.url,
-      shortcut_info.extension_id, shortcut_info.is_platform_app,
-      shortcut_info.profile_path);
+      shortcut_info.extension_id, shortcut_info.profile_path);
 
   // TODO(evan): we rely on the fact that command_line_string() is
   // properly quoted for a Windows command line.  The method on