diff options
author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-27 16:46:03 +0000 |
---|---|---|
committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-27 16:46:03 +0000 |
commit | c9dab4721645020374d6f73fabba6c68ec35000a (patch) | |
tree | 00e94c9d24b7c1eaed24f1d01b0aa0606fa7f42a /chrome/app/generated_resources.grd | |
parent | f15edeb24bd34ef09d6c62b734eca5765f5c2854 (diff) | |
download | chromium_src-c9dab4721645020374d6f73fabba6c68ec35000a.zip chromium_src-c9dab4721645020374d6f73fabba6c68ec35000a.tar.gz chromium_src-c9dab4721645020374d6f73fabba6c68ec35000a.tar.bz2 |
Implements preference setting to allow enabling/disabling the
BackgroundModeManager, to match the gtk/windows versions. Checkbox
sets/clears the kBackgroundModeEnabled preference.
Preferences.xib change: Added new section to under-the-hood,
with a checkbox to enable/disable BackgroundModeManager (which
controls launch-on-login behavior), as well as a link to the help
center section for this feature.
BUG=53173
TEST=Adding BackgroundModeManagerTest.* in separate BackgroundModeManager CL.
Review URL: http://codereview.chromium.org/3199021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57689 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/generated_resources.grd')
-rw-r--r-- | chrome/app/generated_resources.grd | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 95b2daf6..1664f31 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -5667,9 +5667,11 @@ Keep your key file in a safe place. You will need it to create new versions of y </message> <!-- Options Window --> - <message name="IDS_OPTIONS_CHROME_APPS_ENABLE_BACKGROUND_MODE" desc="The label in the checkbox that enables background mode for installed web apps."> - Allow installed web apps to run in the background and launch on system start - </message> + <if expr="os != 'darwin'"> + <message name="IDS_OPTIONS_CHROME_APPS_ENABLE_BACKGROUND_MODE" desc="The label in the checkbox that enables background mode for installed web apps."> + Allow installed web apps to run in the background and launch on system start + </message> + </if> <message name="IDS_OPTIONS_DIALOG_TITLE" desc="The title of the Options dialog box"> <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> Options </message> |