| Index: apps/launcher.cc
|
| diff --git a/apps/launcher.cc b/apps/launcher.cc
|
| index 384d2717c5b1be776b889fa66cd5ed94ce6b0f73..731ff88edf253e8f1ac071469d4e582f05c8ded1 100644
|
| --- a/apps/launcher.cc
|
| +++ b/apps/launcher.cc
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "apps/launcher.h"
|
|
|
| +#include "apps/apps_client.h"
|
| #include "base/command_line.h"
|
| #include "base/file_util.h"
|
| #include "base/files/file_path.h"
|
| @@ -22,7 +23,6 @@
|
| #include "chrome/browser/extensions/extension_system.h"
|
| #include "chrome/browser/extensions/lazy_background_task_queue.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| -#include "chrome/browser/ui/apps/app_metro_infobar_delegate_win.h"
|
| #include "chrome/common/extensions/api/app_runtime.h"
|
| #include "chrome/common/extensions/extension.h"
|
| #include "chrome/common/extensions/extension_messages.h"
|
| @@ -314,16 +314,8 @@ void LaunchPlatformAppWithCommandLine(Profile* profile,
|
| const Extension* extension,
|
| const CommandLine* command_line,
|
| const base::FilePath& current_directory) {
|
| -#if defined(OS_WIN)
|
| - // On Windows 8's single window Metro mode we can not launch platform apps.
|
| - // Offer to switch Chrome to desktop mode.
|
| - if (win8::IsSingleWindowMetroMode()) {
|
| - AppMetroInfoBarDelegateWin::Create(
|
| - profile, AppMetroInfoBarDelegateWin::LAUNCH_PACKAGED_APP,
|
| - extension->id());
|
| + if (!AppsClient::Get()->CheckAppLaunch(profile, extension))
|
| return;
|
| - }
|
| -#endif
|
|
|
| // An app with "kiosk_only" should not be installed and launched
|
| // outside of ChromeOS kiosk mode in the first place. This is a defensive
|
|
|