diff options
| author | macourteau@chromium.org <macourteau@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 01:31:29 +0000 |
|---|---|---|
| committer | macourteau@chromium.org <macourteau@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 01:31:29 +0000 |
| commit | abaca60571344ee85d1bd134cb05b113c7dcc4fa (patch) | |
| tree | a367284fa80174397194de80b6aeaa5a32212c62 /chrome/browser/first_run | |
| parent | 3704d640a5f9ae0255701495de58518d66393eb3 (diff) | |
| download | chromium_src-abaca60571344ee85d1bd134cb05b113c7dcc4fa.zip chromium_src-abaca60571344ee85d1bd134cb05b113c7dcc4fa.tar.gz chromium_src-abaca60571344ee85d1bd134cb05b113c7dcc4fa.tar.bz2 | |
Allows disabling of the "set as default browser" infobar for specific versions of Chrome.
BUG=224103
Review URL: https://chromiumcodereview.appspot.com/12751009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191256 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/first_run')
| -rw-r--r-- | chrome/browser/first_run/first_run.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/first_run/first_run.h | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc index bada01d..255a6da 100644 --- a/chrome/browser/first_run/first_run.cc +++ b/chrome/browser/first_run/first_run.cc @@ -339,6 +339,10 @@ void SetupMasterPrefsFromInstallPrefs( } out_prefs->variations_seed = install_prefs.GetVariationsSeed(); + + install_prefs.GetString( + installer::master_preferences::kDistroSuppressDefaultBrowserPromptPref, + &out_prefs->suppress_default_browser_prompt_for_version); } void SetDefaultBrowser(installer::MasterPreferences* install_prefs){ diff --git a/chrome/browser/first_run/first_run.h b/chrome/browser/first_run/first_run.h index 0867b3a..2bebc46 100644 --- a/chrome/browser/first_run/first_run.h +++ b/chrome/browser/first_run/first_run.h @@ -63,6 +63,10 @@ struct MasterPrefs { MasterPrefs(); ~MasterPrefs(); + // TODO(macourteau): as part of the master preferences refactoring effort, + // remove items from here which are being stored temporarily only to be later + // dumped into local_state. Also see related TODO in chrome_browser_main.cc. + int ping_delay; bool homepage_defined; int do_import_items; @@ -72,6 +76,7 @@ struct MasterPrefs { std::vector<GURL> new_tabs; std::vector<GURL> bookmarks; std::string variations_seed; + std::string suppress_default_browser_prompt_for_version; }; // Returns true if this is the first time chrome is run for this user. |