Remove single-window-metro-mode code paths for the app launcher and apps.

Chrome in Metro now has its own app launcher, and "SingleWindow" Metro
mode is no more.

This CL removes the dead code once required to tear Chrome out of metro
mode in order to show the app launcher, or to launch packaged apps on
the desktop.

BUG=165383

Review URL: https://codereview.chromium.org/226283003

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

5 files changed, 0 insertions, 34 deletions

diff --git a/apps/app_restore_service.cc b/apps/app_restore_service.cc
index e92fd2c..b077266 100644
--- a/apps/app_restore_service.cc
+++ b/apps/app_restore_service.cc
@@ -18,10 +18,6 @@
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
 
-#if defined(OS_WIN)
-#include "win8/util/win8_util.h"
-#endif
-
 using extensions::Extension;
 using extensions::ExtensionHost;
 using extensions::ExtensionPrefs;
@@ -35,10 +31,6 @@ bool AppRestoreService::ShouldRestoreApps(bool is_browser_restart) {
 #if defined(OS_CHROMEOS)
   // Chromeos always restarts apps, even if it was a regular shutdown.
   should_restore_apps = true;
-#elif defined(OS_WIN)
-  // Packaged apps are not supported in Metro mode, so don't try to start them.
-  if (win8::IsSingleWindowMetroMode())
-    should_restore_apps = false;
 #endif
   return should_restore_apps;
 }
diff --git a/apps/apps_client.h b/apps/apps_client.h
index 9af8afb..95a02e6 100644
--- a/apps/apps_client.h
+++ b/apps/apps_client.h
@@ -26,11 +26,6 @@ class AppsClient {
   // Get all loaded browser contexts.
   virtual std::vector<content::BrowserContext*> GetLoadedBrowserContexts() = 0;
 
-  // Do any pre app launch checks. Returns true if the app launch should proceed
-  // or false if the launch should be prevented.
-  virtual bool CheckAppLaunch(content::BrowserContext* context,
-                              const extensions::Extension* extension) = 0;
-
   // Creates a new apps::AppWindow for the app in |extension| for |context|.
   // Caller takes ownership.
   virtual AppWindow* CreateAppWindow(
diff --git a/apps/launcher.cc b/apps/launcher.cc
index 845b259..ba7c829 100644
--- a/apps/launcher.cc
+++ b/apps/launcher.cc
@@ -4,7 +4,6 @@
 
 #include "apps/launcher.h"
 
-#include "apps/apps_client.h"
 #include "apps/browser/api/app_runtime/app_runtime_api.h"
 #include "apps/browser/file_handler_util.h"
 #include "apps/common/api/app_runtime.h"
@@ -41,10 +40,6 @@
 #include "chrome/browser/chromeos/login/user_manager.h"
 #endif
 
-#if defined(OS_WIN)
-#include "win8/util/win8_util.h"
-#endif
-
 namespace app_runtime = apps::api::app_runtime;
 
 using apps::file_handler_util::GrantedFileEntry;
@@ -315,9 +310,6 @@ void LaunchPlatformAppWithCommandLine(Profile* profile,
                                       const Extension* extension,
                                       const CommandLine& command_line,
                                       const base::FilePath& current_directory) {
-  if (!AppsClient::Get()->CheckAppLaunch(profile, extension))
-    return;
-
   // An app with "kiosk_only" should not be installed and launched
   // outside of ChromeOS kiosk mode in the first place. This is a defensive
   // check in case this scenario does occur.
@@ -373,12 +365,6 @@ void LaunchPlatformAppWithFileHandler(Profile* profile,
 }
 
 void RestartPlatformApp(Profile* profile, const Extension* extension) {
-#if defined(OS_WIN)
-  // On Windows 8's single window Metro mode we can not launch platform apps.
-  // In restart we are just making sure launch doesn't slip through.
-  if (win8::IsSingleWindowMetroMode())
-    return;
-#endif
   EventRouter* event_router = EventRouter::Get(profile);
   bool listening_to_restart = event_router->
       ExtensionHasEventListener(extension->id(),
diff --git a/apps/shell/browser/shell_apps_client.cc b/apps/shell/browser/shell_apps_client.cc
index 40b27ba..a838005 100644
--- a/apps/shell/browser/shell_apps_client.cc
+++ b/apps/shell/browser/shell_apps_client.cc
@@ -22,11 +22,6 @@ std::vector<BrowserContext*> ShellAppsClient::GetLoadedBrowserContexts() {
   return browser_contexts;
 }
 
-bool ShellAppsClient::CheckAppLaunch(BrowserContext* context,
-                                     const extensions::Extension* extension) {
-  return true;
-}
-
 AppWindow* ShellAppsClient::CreateAppWindow(
     BrowserContext* context,
     const extensions::Extension* extension) {
diff --git a/apps/shell/browser/shell_apps_client.h b/apps/shell/browser/shell_apps_client.h
index c374cd7..cade20d 100644
--- a/apps/shell/browser/shell_apps_client.h
+++ b/apps/shell/browser/shell_apps_client.h
@@ -26,8 +26,6 @@ class ShellAppsClient : public AppsClient {
   // apps::AppsClient implementation:
   virtual std::vector<content::BrowserContext*> GetLoadedBrowserContexts()
       OVERRIDE;
-  virtual bool CheckAppLaunch(content::BrowserContext* context,
-                              const extensions::Extension* extension) OVERRIDE;
   virtual AppWindow* CreateAppWindow(content::BrowserContext* context,
                                      const extensions::Extension* extension)
       OVERRIDE;