summaryrefslogtreecommitdiffstats
path: root/chrome/browser/prefs
diff options
context:
space:
mode:
authormacourteau@chromium.org <macourteau@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-29 01:31:29 +0000
committermacourteau@chromium.org <macourteau@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-29 01:31:29 +0000
commitabaca60571344ee85d1bd134cb05b113c7dcc4fa (patch)
treea367284fa80174397194de80b6aeaa5a32212c62 /chrome/browser/prefs
parent3704d640a5f9ae0255701495de58518d66393eb3 (diff)
downloadchromium_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/prefs')
-rw-r--r--chrome/browser/prefs/browser_prefs.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 66d83ec..db51151 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -77,6 +77,7 @@
#include "chrome/browser/ui/prefs/prefs_tab_helper.h"
#include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
#include "chrome/browser/ui/startup/autolaunch_prompt.h"
+#include "chrome/browser/ui/startup/default_browser_prompt.h"
#include "chrome/browser/ui/tabs/pinned_tab_codec.h"
#include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
#include "chrome/browser/ui/webui/flags_ui.h"
@@ -231,6 +232,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
BackgroundModeManager::RegisterPrefs(registry);
chrome_variations::VariationsService::RegisterPrefs(registry);
RegisterBrowserPrefs(registry);
+ RegisterDefaultBrowserPromptPrefs(registry);
ManagedMode::RegisterPrefs(registry);
#endif