diff options
| author | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-29 12:08:16 +0000 |
|---|---|---|
| committer | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-29 12:08:16 +0000 |
| commit | 00bbf288f956c321b02c98ba5046c1728b248934 (patch) | |
| tree | 3aaaee6ca2b24e686ab275c149ec58cb9351cd80 /chrome/common/mac/app_mode_common.h | |
| parent | 946d4cb34091f76050d04d0be5c71e3f0bee95da (diff) | |
| download | chromium_src-00bbf288f956c321b02c98ba5046c1728b248934.zip chromium_src-00bbf288f956c321b02c98ba5046c1728b248934.tar.gz chromium_src-00bbf288f956c321b02c98ba5046c1728b248934.tar.bz2 | |
Mac: Enable WebAppShortcutCreatorTest.CreateShortcut unit test
* Mock out code to reveal generated app bundle in Finder.
* Change how we fill in the template plist to a variable substitution model.
* Clean app_mode-Info.plist to remove unneeded keys.
BUG=112651
TEST=WebAppShortcutCreatorTest.CreateShortcut should pass.
Review URL: http://codereview.chromium.org/9426030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124174 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 | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/chrome/common/mac/app_mode_common.h b/chrome/common/mac/app_mode_common.h index b8bc539..f0f3ad2 100644 --- a/chrome/common/mac/app_mode_common.h +++ b/chrome/common/mac/app_mode_common.h @@ -23,10 +23,7 @@ extern NSString* const kBrowserBundleIDKey; // Key for the shortcut ID. extern NSString* const kCrAppModeShortcutIDKey; -// Key for the app's shortcut name. -extern NSString* const kCrAppModeShortcutShortNameKey; - -// Key for the app's unrestricted name. +// Key for the app's name. extern NSString* const kCrAppModeShortcutNameKey; // Key for the app's URL. @@ -42,9 +39,12 @@ extern NSString* const kCrAppModeExtensionPathKey; // system using this key. extern NSString* const kLastRunAppBundlePathPrefsKey; -// Placeholder used in the Info.plist, meant to be replaced by the extension -// shortcut ID. -extern NSString* const kShortcutIdPlaceholder; +// Placeholders used in the app mode loader bundle' Info.plist: +extern NSString* const kShortcutIdPlaceholder; // Extension shortcut ID. +extern NSString* const kShortcutNamePlaceholder; // Extension name. +extern NSString* const kShortcutURLPlaceholder; +// Bundle ID of the Chrome browser bundle. +extern NSString* const kShortcutBrowserBundleIDPlaceholder; // Current major/minor version numbers of |ChromeAppModeInfo| (defined below). const unsigned kCurrentChromeAppModeInfoMajorVersion = 1; @@ -84,9 +84,6 @@ struct ChromeAppModeInfo { // safe for the file system. std::string app_mode_id; // Required: v1.0 - // Short (e.g., one-word) UTF8-encoded name for the shortcut. - string16 app_mode_short_name; // Optional: v1.0 - // Unrestricted (e.g., several-word) UTF8-encoded name for the shortcut. string16 app_mode_name; // Optional: v1.0 |