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 04:50:21 +0000
committersail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-24 04:50:21 +0000
commit2b80909f744b772ce76bb52e83368e6590fb9df0 (patch)
treedfa8e845c8a00b25151735c2512485706d2a98b1 /chrome/common/mac
parenta82af39780861fe06a8682791a0ac477fb167531 (diff)
downloadchromium_src-2b80909f744b772ce76bb52e83368e6590fb9df0.zip
chromium_src-2b80909f744b772ce76bb52e83368e6590fb9df0.tar.gz
chromium_src-2b80909f744b772ce76bb52e83368e6590fb9df0.tar.bz2
Add user data dir field to Mac platform apps
With this CL we now specify an explicit data dir for Mac platform apps. This CL also cleans up the various GetDataDir* functions in web_app.h. BUG=112651 TEST= Review URL: https://chromiumcodereview.appspot.com/9423048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123439 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 5267cd4..04851de 100644
--- a/chrome/common/mac/app_mode_common.h
+++ b/chrome/common/mac/app_mode_common.h
@@ -36,6 +36,9 @@ extern NSString* const kCrAppModeShortcutNameKey;
// Key for the app's URL.
extern NSString* const kCrAppModeShortcutURLKey;
+// Key for the app user data directory.
+extern NSString* const kCrAppModeUserDataDirKey;
+
// Current major/minor version numbers of |ChromeAppModeInfo| (defined below).
const unsigned kCurrentChromeAppModeInfoMajorVersion = 1;
const unsigned kCurrentChromeAppModeInfoMinorVersion = 0;
@@ -79,6 +82,9 @@ struct ChromeAppModeInfo {
// URL for the shortcut. Must be a valid URL.
std::string app_mode_url; // Required: v1.0
+
+ // Path to the app's user data directory.
+ FilePath user_data_dir;
};
} // namespace app_mode
diff --git a/chrome/common/mac/app_mode_common.mm b/chrome/common/mac/app_mode_common.mm
index e006965..40de720 100644
--- a/chrome/common/mac/app_mode_common.mm
+++ b/chrome/common/mac/app_mode_common.mm
@@ -12,6 +12,7 @@ NSString* const kCrAppModeShortcutIDKey = @"CrAppModeShortcutID";
NSString* const kCrAppModeShortcutShortNameKey = @"CrAppModeShortcutShortName";
NSString* const kCrAppModeShortcutNameKey = @"CrAppModeShortcutName";
NSString* const kCrAppModeShortcutURLKey = @"CrAppModeShortcutURL";
+NSString* const kCrAppModeUserDataDirKey = @"CrAppModeUserDataDir";
ChromeAppModeInfo::ChromeAppModeInfo()
: major_version(0),