diff options
author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-13 20:49:49 +0000 |
---|---|---|
committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-13 20:49:49 +0000 |
commit | e7e637e8bd396270ddfc0c218818b62ef5277cec (patch) | |
tree | 90c167762fd39d9bc32469ed9589b5abe03f42c7 /chrome/app | |
parent | c439dc1f780f967817c917ed53cb1c39635092c0 (diff) | |
download | chromium_src-e7e637e8bd396270ddfc0c218818b62ef5277cec.zip chromium_src-e7e637e8bd396270ddfc0c218818b62ef5277cec.tar.gz chromium_src-e7e637e8bd396270ddfc0c218818b62ef5277cec.tar.bz2 |
Add "Keep chrome running in background" preference.
BUG=76828
TEST=Install background app, disable "Keep chrome running in background", see status tray icon disappear.
Review URL: http://codereview.chromium.org/6954001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85318 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r-- | chrome/app/chrome_command_ids.h | 3 | ||||
-rw-r--r-- | chrome/app/chromium_strings.grd | 9 | ||||
-rw-r--r-- | chrome/app/generated_resources.grd | 3 | ||||
-rw-r--r-- | chrome/app/google_chrome_strings.grd | 9 |
4 files changed, 24 insertions, 0 deletions
diff --git a/chrome/app/chrome_command_ids.h b/chrome/app/chrome_command_ids.h index a9cabbf..b149d62 100644 --- a/chrome/app/chrome_command_ids.h +++ b/chrome/app/chrome_command_ids.h @@ -272,3 +272,6 @@ #define IDC_BOOKMARK_BAR_NEW_FOLDER 51008 #define IDC_BOOKMARK_MANAGER 51009 #define IDC_BOOKMARK_BAR_ALWAYS_SHOW 51010 + +// Context menu items in the status tray +#define IDC_STATUS_TRAY_KEEP_CHROME_RUNNING_IN_BACKGROUND 51100 diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd index eb34a83..fb5960b 100644 --- a/chrome/app/chromium_strings.grd +++ b/chrome/app/chromium_strings.grd @@ -336,6 +336,15 @@ be available for now. --> Please sign out of Chromium OS and sign in again for this change to take effect. </message> </if> + <message name="IDS_STATUS_TRAY_KEEP_CHROME_RUNNING_IN_BACKGROUND" desc="The checkbox in the status tray context menu that controls whether chrome keeps running in the background after the last window is closed"> + Let Chromium Run In The Background + </message> + <message name="IDS_OPTIONS_BACKGROUND_ENABLE_BACKGROUND_MODE" desc="The label of the check-box that enables background mode"> + Continue running background apps when Chromium is closed + </message> + <message name="IDS_CONFIRM_EXIT_BACKGROUND_MODE_BODY" desc="Confirmation displayed when disabling background mode via the status tray context menu when there are no windows open"> + Are you sure you want to quit Chromium? (This setting can be toggled in <ph name="OPTIONS_MENU_LABEL">$1<ex>Options</ex></ph> - Under the Hood) + </message> <message name="IDS_CANT_WRITE_USER_DIRECTORY_SUMMARY" desc="Summary of problem displayed in dialog when we can't create a directory for this user."> Chromium cannot read and write to its data directory:\n\n<ph name="USER_DATA_DIRECTORY">$1<ex>C:\Documents and Settings\devint\Local Settings\Application Data\Google\Chrome</ex></ph> </message> diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index ca6f843..ad453c9 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -8306,6 +8306,9 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_OPTIONS_ADVANCED_SECTION_TITLE_CLOUD_PRINT"> <ph name="CLOUD_PRINT_NAME">Google Cloud Print</ph> </message> + <message name="IDS_OPTIONS_ADVANCED_SECTION_TITLE_BACKGROUND"> + Background Apps + </message> <!-- Multiple download warning--> <message name="IDS_MULTI_DOWNLOAD_WARNING" desc="Warning invoked if multiple downloads are attempted without user interaction."> diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd index 343a5b21d..4870fe8 100644 --- a/chrome/app/google_chrome_strings.grd +++ b/chrome/app/google_chrome_strings.grd @@ -342,6 +342,15 @@ Chrome supports. --> Please sign out of Chrome OS and sign in again for this change to take effect. </message> </if> + <message name="IDS_STATUS_TRAY_KEEP_CHROME_RUNNING_IN_BACKGROUND" desc="The checkbox in the status tray context menu that controls whether chrome keeps running in the background after the last window is closed"> + Let Google Chrome Run In The Background + </message> + <message name="IDS_OPTIONS_BACKGROUND_ENABLE_BACKGROUND_MODE" desc="The label of the check-box that enables background mode"> + Continue running background apps when Google Chrome is closed + </message> + <message name="IDS_CONFIRM_EXIT_BACKGROUND_MODE_BODY" desc="Confirmation displayed when disabling background mode via the status tray context menu when there are no windows open"> + Are you sure you want to quit Google Chrome? (This setting can be toggled in <ph name="OPTIONS_MENU_LABEL">$1<ex>Options</ex></ph> - Under the Hood) + </message> <message name="IDS_CANT_WRITE_USER_DIRECTORY_SUMMARY" desc="Summary of problem displayed in dialog when we can't create a directory for this user."> Google Chrome cannot read and write to its data directory:\n\n<ph name="USER_DATA_DIRECTORY">$1<ex>C:\Documents and Settings\devint\Local Settings\Application Data\Google\Chrome</ex></ph> </message> |