diff options
| author | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-25 00:23:34 +0000 |
|---|---|---|
| committer | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-25 00:23:34 +0000 |
| commit | c1dbcb178ba806f1c7b7e26e4e14deb85cb9b720 (patch) | |
| tree | 0b1ceb20c77cfd9b02a364e3cbc02ed41f017504 /apps/apps.gypi | |
| parent | 0700471c72bca247109af0165d09173ce9c107c8 (diff) | |
| download | chromium_src-c1dbcb178ba806f1c7b7e26e4e14deb85cb9b720.zip chromium_src-c1dbcb178ba806f1c7b7e26e4e14deb85cb9b720.tar.gz chromium_src-c1dbcb178ba806f1c7b7e26e4e14deb85cb9b720.tar.bz2 | |
Show an InfoBar when trying to start Packaged Apps from Metro mode.
Platform Apps do not function properly while in Metro mode.
This change intercepts platform app launch requests done
while the browser is in metro mode, redirecting them to an
infobar. If "yes" is chosen, a local pref is stored with the
extension id and Profile that tried to launch it, and a relaunch
of Chrome in Desktop mode is triggered. Upon restart,
apps::AppLaunchOnRestartService is responsible for launching the
selected app, and clearing the pref.
BUG=153426
TEST=With Chrome configured for Windows 8 mode, try to start a
packaged app. This can be done from NTP (if launcher not enabled),
or from a taskbar shortcut, a desktop shortcut, or a pinned start
page tile. InfoBar should display offering to switch to Desktop mode.
If switching, selected packaged app should launch after a brief
delay.
Review URL: https://chromiumcodereview.appspot.com/12450014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190306 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/apps.gypi')
| -rw-r--r-- | apps/apps.gypi | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/apps/apps.gypi b/apps/apps.gypi index aa2330b..8760e17 100644 --- a/apps/apps.gypi +++ b/apps/apps.gypi @@ -1,4 +1,4 @@ -# Copyright (c) 2013 The Chromium Authors. All rights reserved. +# Copyright 2013 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. @@ -22,16 +22,18 @@ '<(INTERMEDIATE_DIR)', ], 'sources': [ - 'app_shim/app_shim_host_mac.cc', - 'app_shim/app_shim_host_mac.h', - 'app_shim/app_shim_host_manager_mac.h', - 'app_shim/app_shim_host_manager_mac.mm', + 'app_launch_for_metro_restart_win.cc', + 'app_launch_for_metro_restart_win.h', 'app_launcher.cc', 'app_launcher.h', 'app_restore_service.cc', 'app_restore_service.h', 'app_restore_service_factory.cc', 'app_restore_service_factory.h', + 'app_shim/app_shim_host_mac.cc', + 'app_shim/app_shim_host_mac.h', + 'app_shim/app_shim_host_manager_mac.h', + 'app_shim/app_shim_host_manager_mac.mm', 'pref_names.cc', 'pref_names.h', 'prefs.cc', |