summaryrefslogtreecommitdiffstats
path: root/chrome/common/mac
diff options
context:
space:
mode:
authorsail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-24 06:52:47 +0000
committersail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-24 06:52:47 +0000
commit37801707bc6cfae9a473e1319a04569a0f37e7ca (patch)
tree95f832946c9b3b78df755be188332f03e25d5356 /chrome/common/mac
parent8936b55b8e4b271892924bdbcd4c196c75ddd5bc (diff)
downloadchromium_src-37801707bc6cfae9a473e1319a04569a0f37e7ca.zip
chromium_src-37801707bc6cfae9a473e1319a04569a0f37e7ca.tar.gz
chromium_src-37801707bc6cfae9a473e1319a04569a0f37e7ca.tar.bz2
Add extension path field to Mac platform apps
This CL adds a new extension path field to Mac platform apps. This path is used to load the extension for Mac platform apps. BUG=112651 TEST=Installed a platform app. Verified that it could run side by side with Chromium. Review URL: http://codereview.chromium.org/9374009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123443 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/mac')
-rw-r--r--chrome/common/mac/app_mode_common.h6
-rw-r--r--chrome/common/mac/app_mode_common.mm1
2 files changed, 7 insertions, 0 deletions
diff --git a/chrome/common/mac/app_mode_common.h b/chrome/common/mac/app_mode_common.h
index 04851de..930d22d 100644
--- a/chrome/common/mac/app_mode_common.h
+++ b/chrome/common/mac/app_mode_common.h
@@ -39,6 +39,9 @@ extern NSString* const kCrAppModeShortcutURLKey;
// Key for the app user data directory.
extern NSString* const kCrAppModeUserDataDirKey;
+// Key for the app's extension path.
+extern NSString* const kCrAppModeExtensionPathKey;
+
// Current major/minor version numbers of |ChromeAppModeInfo| (defined below).
const unsigned kCurrentChromeAppModeInfoMajorVersion = 1;
const unsigned kCurrentChromeAppModeInfoMinorVersion = 0;
@@ -85,6 +88,9 @@ struct ChromeAppModeInfo {
// Path to the app's user data directory.
FilePath user_data_dir;
+
+ // Path to the app's extension.
+ FilePath extension_path;
};
} // namespace app_mode
diff --git a/chrome/common/mac/app_mode_common.mm b/chrome/common/mac/app_mode_common.mm
index 40de720..48bf38e 100644
--- a/chrome/common/mac/app_mode_common.mm
+++ b/chrome/common/mac/app_mode_common.mm
@@ -13,6 +13,7 @@ NSString* const kCrAppModeShortcutShortNameKey = @"CrAppModeShortcutShortName";
NSString* const kCrAppModeShortcutNameKey = @"CrAppModeShortcutName";
NSString* const kCrAppModeShortcutURLKey = @"CrAppModeShortcutURL";
NSString* const kCrAppModeUserDataDirKey = @"CrAppModeUserDataDir";
+NSString* const kCrAppModeExtensionPathKey = @"CrAppModeExtensionPath";
ChromeAppModeInfo::ChromeAppModeInfo()
: major_version(0),