Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2630)

Unified Diff: apps/launcher.cc

Issue 226283003: Remove single-window-metro-mode code paths for the app launcher and apps. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Thought I deleted this already Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « apps/apps_client.h ('k') | apps/shell/browser/shell_apps_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: apps/launcher.cc
diff --git a/apps/launcher.cc b/apps/launcher.cc
index 845b259a733a1f0dc9400903ad7cbf5759a2669b..ba7c829b07d81746846a13804659d220ed369acc 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(),
« no previous file with comments | « apps/apps_client.h ('k') | apps/shell/browser/shell_apps_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698