Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1635)

Unified Diff: chrome/common/pref_names.h

Issue 15969017: Warn by default when certain DLL conflicts exist on XP. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Freshly sync'ed Created 7 years, 6 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | chrome/common/pref_names.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/pref_names.h
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index cbd9e1410cae187f0a511cadf253230cdc33662e..7bb20d824d54d7ce72e0d7c3bc7eaae18224a7c6 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -923,6 +923,8 @@ extern const char kAppListLaunchCount[];
extern const char kLastAppListAppLaunchPing[];
extern const char kAppListAppLaunchCount[];
+extern const char kModuleConflictBubbleShown[];
+
extern const char kDRMSalt[];
extern const char kEnableDRM[];
« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | chrome/common/pref_names.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698