diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-06 15:28:33 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-06 15:28:33 +0000 |
| commit | d04126a3612e00bb1f6b88c4bc58d1c16eeaaa67 (patch) | |
| tree | e2fc74c82e6f7fe86337730ad78ed4c3a99fde3f /chrome/browser/ui/browser_ui_prefs.cc | |
| parent | 146c1a865f9782e2d21a70cf07748b2685e0267f (diff) | |
| download | chromium_src-d04126a3612e00bb1f6b88c4bc58d1c16eeaaa67.zip chromium_src-d04126a3612e00bb1f6b88c4bc58d1c16eeaaa67.tar.gz chromium_src-d04126a3612e00bb1f6b88c4bc58d1c16eeaaa67.tar.bz2 | |
Warn by default when certain DLL conflicts exist on XP.
BUG=238378
R=cpu@chromium.org, jhawkins@chromium.org, sky@chromium.org
Review URL: https://codereview.chromium.org/15969017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204505 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_ui_prefs.cc')
| -rw-r--r-- | chrome/browser/ui/browser_ui_prefs.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc index 8a32376..db72a05 100644 --- a/chrome/browser/ui/browser_ui_prefs.cc +++ b/chrome/browser/ui/browser_ui_prefs.cc @@ -79,6 +79,9 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) { prefs::kLastClearBrowsingDataTime, 0, user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); + registry->RegisterIntegerPref(prefs::kModuleConflictBubbleShown, + 0, + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); registry->RegisterBooleanPref( prefs::kCheckDefaultBrowser, true, |