summaryrefslogtreecommitdiffstats
path: root/chrome/common/mac
diff options
context:
space:
mode:
authorjackhou@chromium.org <jackhou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-31 02:09:38 +0000
committerjackhou@chromium.org <jackhou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-31 02:09:38 +0000
commit4bbdf9ec9909d7a019ac2eedf793b936fc2f3834 (patch)
tree25d287f842757042e3a0fb8fe0697cf398e88f9c /chrome/common/mac
parent1325b2b2a621627c099bece87725cc0eb582a891 (diff)
downloadchromium_src-4bbdf9ec9909d7a019ac2eedf793b936fc2f3834.zip
chromium_src-4bbdf9ec9909d7a019ac2eedf793b936fc2f3834.tar.gz
chromium_src-4bbdf9ec9909d7a019ac2eedf793b936fc2f3834.tar.bz2
Start app shim when app launched.
ExtensionAppShimHandler launches the relevant shim in response to NOTIFICATION_EXTENSION_HOST_CREATED. A new field is added to the LaunchApp IPC message: launch_now. This indicates whether to launch the app immediately. This prevents the shim launching the app again. BUG=168080 TEST=Find an app that has an app shim bundle. Launch it from the launcher or new tab page. The shim should start. Review URL: https://chromiumcodereview.appspot.com/14579006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203309 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/mac')
-rw-r--r--chrome/common/mac/app_mode_common.h4
-rw-r--r--chrome/common/mac/app_mode_common.mm2
2 files changed, 6 insertions, 0 deletions
diff --git a/chrome/common/mac/app_mode_common.h b/chrome/common/mac/app_mode_common.h
index eb068fa..8bb114f 100644
--- a/chrome/common/mac/app_mode_common.h
+++ b/chrome/common/mac/app_mode_common.h
@@ -29,6 +29,10 @@ extern const char kAppShimSocketName[];
// Special app mode id used for the App Launcher.
extern const char kAppListModeId[];
+// Instructs the app shim to send LaunchApp with launch_now = false. This
+// associates the shim without launching the app.
+extern const char kNoLaunchApp[];
+
// The key under which the browser's bundle ID will be stored in the
// app mode launcher bundle's Info.plist.
extern NSString* const kBrowserBundleIDKey;
diff --git a/chrome/common/mac/app_mode_common.mm b/chrome/common/mac/app_mode_common.mm
index 7be84ca..ae5e2f7 100644
--- a/chrome/common/mac/app_mode_common.mm
+++ b/chrome/common/mac/app_mode_common.mm
@@ -10,6 +10,8 @@ const char kAppShimSocketName[] = "App Shim Socket";
const char kAppListModeId[] = "app_list";
+const char kNoLaunchApp[] = "no-launch-app";
+
NSString* const kBrowserBundleIDKey = @"CrBundleIdentifier";
NSString* const kCrAppModeShortcutIDKey = @"CrAppModeShortcutID";
NSString* const kCrAppModeShortcutNameKey = @"CrAppModeShortcutName";