chrome/browser/ui/browser_ui_prefs.cc - Issue 15969017: Warn by default when certain DLL conflicts exist on XP.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/browser_ui_prefs.cc

Issue 15969017: Warn by default when certain DLL conflicts exist on XP. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Ready for try servers Created 7 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/ui/browser_ui_prefs.cc

diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc

index 969b4ddacaadc37e8979057b069dd2e5a954a5b3..e38c9dadca51e24c061860cc4415cdb47ab6f823 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,

user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);

+ registry->RegisterIntegerPref(prefs::kModuleConflictBubbleShown,

+ 0,

+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);

registry->RegisterBooleanPref(

prefs::kCheckDefaultBrowser,

true,