diff options
| author | jackhou@chromium.org <jackhou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-18 18:26:38 +0000 |
|---|---|---|
| committer | jackhou@chromium.org <jackhou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-18 18:26:38 +0000 |
| commit | 5bbfbae20e9c1871d100d649c4c59e39e4264da4 (patch) | |
| tree | 9a4b7e065f65071173eea850c3cfa8eddad195c6 /chrome/common/mac/app_mode_common.h | |
| parent | 34f1c4212da0da25773254f32b3c8f76fb56af45 (diff) | |
| download | chromium_src-5bbfbae20e9c1871d100d649c4c59e39e4264da4.zip chromium_src-5bbfbae20e9c1871d100d649c4c59e39e4264da4.tar.gz chromium_src-5bbfbae20e9c1871d100d649c4c59e39e4264da4.tar.bz2 | |
[Mac] Rebuild app shims when they fail to dyload Chrome Framework.
This also changes app_mode_loader to start Chrome with --app-shim-error
only when it was started by Chrome or if it is the app_list shim. When
started by the user, it launches Chrome with --app-id. This simplifies
how Chrome handles --app-shim-error. It does not need to load the
profile or app extension, and rebuilding the shim does not block
launching the app.
BUG=353047
Review URL: https://codereview.chromium.org/265163006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278126 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/mac/app_mode_common.h')
| -rw-r--r-- | chrome/common/mac/app_mode_common.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/common/mac/app_mode_common.h b/chrome/common/mac/app_mode_common.h index 4d686da..670b883 100644 --- a/chrome/common/mac/app_mode_common.h +++ b/chrome/common/mac/app_mode_common.h @@ -41,6 +41,10 @@ extern const char kLaunchedByChromeProcessId[]; // launch Chrome. extern const char kLaunchedForTest[]; +// Indicates to the shim that this Chrome has rebuilt it once already, i.e. if +// it fails to launch again, don't trigger another rebuild. +extern const char kLaunchedAfterRebuild[]; + // Path to an app shim bundle. Indicates to Chrome that this shim attempted to // launch but failed. extern const char kAppShimError[]; @@ -98,7 +102,7 @@ extern NSString* const kShortcutBrowserBundleIDPlaceholder; // Current major/minor version numbers of |ChromeAppModeInfo| (defined below). const unsigned kCurrentChromeAppModeInfoMajorVersion = 1; -const unsigned kCurrentChromeAppModeInfoMinorVersion = 1; +const unsigned kCurrentChromeAppModeInfoMinorVersion = 2; // The structure used to pass information from the app mode loader to the // (browser) framework. This is versioned using major and minor version numbers, |