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/common | |
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/common')
-rw-r--r-- | chrome/common/chrome_switches.cc | 6 | ||||
-rw-r--r-- | chrome/common/chrome_switches.h | 1 | ||||
-rw-r--r-- | chrome/common/pref_names.cc | 4 | ||||
-rw-r--r-- | chrome/common/pref_names.h | 2 |
4 files changed, 12 insertions, 1 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 69f28d8..8a15341 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -105,13 +105,17 @@ const char kAuthNegotiateDelegateWhitelist[] = // HTTP authentication schemes to enable. This is a comma-separated list of // authentication schemes (basic, digest, ntlm, and negotiate). By default all // schemes are enabled. The primary use of this command line flag is to help -// triage autentication-related issues reported by end-users. +// triage authentication-related issues reported by end-users. const char kAuthSchemes[] = "auth-schemes"; // Whitelist of servers which NTLM and Negotiate can automatically authenticate // with using the default credentials of the currently logged in user. const char kAuthServerWhitelist[] = "auth-server-whitelist"; +// A flag that is used to tell Chrome that it was launched automatically at +// computer startup and not by some user action. +const char kAutoLaunchAtStartup[] = "auto-launch-at-startup"; + // The value of this switch tells the app to listen for and broadcast // automation-related messages on IPC channel with the given ID. const char kAutomationClientChannelID[] = "automation-channel"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index e986f20..1d57efa 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -47,6 +47,7 @@ extern const char kAppsNoThrob[]; extern const char kAuthNegotiateDelegateWhitelist[]; extern const char kAuthSchemes[]; extern const char kAuthServerWhitelist[]; +extern const char kAutoLaunchAtStartup[]; extern const char kAutomationClientChannelID[]; extern const char kAutomationReinitializeOnChannelError[]; extern const char kCheckForUpdateIntervalSec[]; diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc index 0b74a90..52155e2 100644 --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc @@ -1524,6 +1524,10 @@ const char kCloudPrintSigninDialogHeight[] = // launches. const char kRegisteredBackgroundContents[] = "background_contents.registered"; +// An int that stores how often we've shown the "Chrome is configured to +// auto-launch" infobar. +const char kShownAutoLaunchInfobar[] = "browser.shown_autolaunch_infobar"; + // String that lists supported HTTP authentication schemes. const char kAuthSchemes[] = "auth.schemes"; diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h index dc9d902..5645621a 100644 --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h @@ -607,6 +607,8 @@ extern const char kChromeOsReleaseChannel[]; extern const char kRegisteredBackgroundContents[]; +extern const char kShownAutoLaunchInfobar[]; + extern const char kAuthSchemes[]; extern const char kDisableAuthNegotiateCnameLookup[]; extern const char kEnableAuthNegotiatePort[]; |