summaryrefslogtreecommitdiffstats
path: root/chrome/common/mac
diff options
context:
space:
mode:
authorjackhou@chromium.org <jackhou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-26 09:23:46 +0000
committerjackhou@chromium.org <jackhou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-26 09:23:46 +0000
commitc852b7ad4d99658dddf8fe28265855bcd49fafa8 (patch)
tree4f942203918127f38ca54eccf5bba6f23ce871c1 /chrome/common/mac
parent9737b3637bcdcd39c3a5cdf666380113ffb3a247 (diff)
downloadchromium_src-c852b7ad4d99658dddf8fe28265855bcd49fafa8.zip
chromium_src-c852b7ad4d99658dddf8fe28265855bcd49fafa8.tar.gz
chromium_src-c852b7ad4d99658dddf8fe28265855bcd49fafa8.tar.bz2
Send Chrome's process id to the app shim.
This saves the app shim from having to look it up using Chrome's bundle id. This also allows the shim to connect to Chrome processes started by tests which are not associated with the bundle. BUG=168080 Review URL: https://chromiumcodereview.appspot.com/22903025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219519 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/mac')
-rw-r--r--chrome/common/mac/app_mode_common.h7
-rw-r--r--chrome/common/mac/app_mode_common.mm2
2 files changed, 5 insertions, 4 deletions
diff --git a/chrome/common/mac/app_mode_common.h b/chrome/common/mac/app_mode_common.h
index d397c4b..de82e24 100644
--- a/chrome/common/mac/app_mode_common.h
+++ b/chrome/common/mac/app_mode_common.h
@@ -29,9 +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 process ID of the Chrome process that launched the app shim.
+// The presence of this switch instructs the app shim to send LaunchApp with
+// launch_now = false. This associates the shim without launching the app.
+extern const char kLaunchedByChromeProcessId[];
// The display name of the bundle as shown in Finder and the Dock. For localized
// bundles, this overrides the bundle's file name.
diff --git a/chrome/common/mac/app_mode_common.mm b/chrome/common/mac/app_mode_common.mm
index f67eb2f..317dec3 100644
--- a/chrome/common/mac/app_mode_common.mm
+++ b/chrome/common/mac/app_mode_common.mm
@@ -10,7 +10,7 @@ const char kAppShimSocketName[] = "App Shim Socket";
const char kAppListModeId[] = "app_list";
-const char kNoLaunchApp[] = "no-launch-app";
+const char kLaunchedByChromeProcessId[] = "launched-by-chrome-process-id";
NSString* const kCFBundleDisplayNameKey = @"CFBundleDisplayName";
NSString* const kLSHasLocalizedDisplayNameKey = @"LSHasLocalizedDisplayName";