chrome/common/pref_names.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/common/pref_names.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/common/pref_names.cc

diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc

index 40abeab8cb12b93999720ecd6b4fa42be8bbd767..650607a1f090dd846cf5256fe1f5cdcbc4449841 100644

--- a/chrome/common/pref_names.cc

+++ b/chrome/common/pref_names.cc

@@ -2472,6 +2472,9 @@ extern const char kLastAppListLaunchPing[] = "app_list.last_launch_ping";

extern const char kAppListAppLaunchCount[] = "app_list.app_launch_count";

extern const char kLastAppListAppLaunchPing[] = "app_list.last_app_launch_ping";

+// How often the bubble has been shown.

+extern const char kModuleConflictBubbleShown[] = "module_conflict.bubble_shown";

// A string pref for storing the salt used to compute the pepper device ID.

const char kDRMSalt[] = "settings.privacy.drm_salt";

// A boolean pref that enables the (private) pepper GetDeviceID() call.