diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-15 10:45:32 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-15 10:45:32 +0000 |
| commit | 0cba296108328045bad62e2286f5ec6a2e4fd7e8 (patch) | |
| tree | 5d60490adfbb0d68f62e51809551b6cfb6e19063 /chrome/app/generated_resources.grd | |
| parent | e69786054d76d7a8cc2a15536597b2ffb248afde (diff) | |
| download | chromium_src-0cba296108328045bad62e2286f5ec6a2e4fd7e8.zip chromium_src-0cba296108328045bad62e2286f5ec6a2e4fd7e8.tar.gz chromium_src-0cba296108328045bad62e2286f5ec6a2e4fd7e8.tar.bz2 | |
Implement an AutoLaunch experiment for Chrome for certain brand codes. This is for Windows only.
BUG=95971
TEST=This requires a special branded build to test (and master_preferences set to have auto_launch_chrome: true or specify mini_installer param --auto-launch-chrome), but after installing it you should see an item under the Wrench \ Options \ Basics that lets you configure Chrome to not auto-launch. If you instead, log out and log in again, Chrome should start with an infobar saying that it was auto-launched. The infobar should stay for a max of 5 launches and then not appear again. Pressing "Cut it out!" on the infobar should turn off this feature. If you just want to test the infobar, launch chrome with --auto-launch-at-startup. Also, uninstall and make sure Chrome is not auto-launched (a Windows error about Chrome not being found should not be shown).
Review URL: http://codereview.chromium.org/8729009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114621 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/generated_resources.grd')
| -rw-r--r-- | chrome/app/generated_resources.grd | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index e090943..b4e9a27 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -3625,6 +3625,17 @@ Public Exponent (<ph name="PUBLIC_EXPONENT_NUM_BITS">$3<ex>24</ex></ph> bits): View </message> + <!-- Autolaunch infobar --> + <message name="IDS_AUTO_LAUNCH_INFOBAR_TEXT" desc="The text to show in the infobar when Chrome was automatically launched on startup"> + <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> is configured to automatically launch when you start your computer. + </message> + <message name="IDS_AUTO_LAUNCH_OK" desc="Label for OK button on Autolaunch confirmation infobar."> + OK + </message> + <message name="IDS_AUTO_LAUNCH_REVERT" desc="Label for button (on Autolaunch confirmation infobar) that disables autolaunching."> + Cut it out! + </message> + <!-- Basic Auth Dialog --> <message name="IDS_LOGIN_DIALOG_TITLE" desc="String to be displayed in the title bar of the login prompt dialog"> Authentication Required @@ -8192,6 +8203,9 @@ Would you like to start <ph name="CONTROL_PANEL_APPLET_NAME">$1<ex>Add/Remove Pr <message name="IDS_OPTIONS_DEFAULTBROWSER_SXS" desc="The text displayed when Chrome is installed in side-by-side mode, which does not support setting as the default browser."> This is a secondary installation of <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>, and cannot be made your default browser. </message> + <message name="IDS_AUTOLAUNCH_TEXT" desc="The text displayed in settings to explain whether Chrome is set to auto-launch on startup or not."> + Launch <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> automatically when I start my computer + </message> <if expr="pp_ifdef('use_titlecase')"> <message name="IDS_OPTIONS_DEFAULTBROWSER_USEASDEFAULT" desc="In Title Case: The label of the 'Use Chrome as default' browser button"> |