Warn by default when certain DLL conflicts exist on XP.

chrome/browser/ui/browser_ui_prefs.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/browser_ui_prefs.h"
 
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 61 matching lines @@
       false,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterIntegerPref(
       prefs::kDeleteTimePeriod,
       0,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterInt64Pref(
       prefs::kLastClearBrowsingDataTime,
       0,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterIntegerPref(prefs::kModuleConflictBubbleShown,
+      0,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterBooleanPref(
       prefs::kCheckDefaultBrowser,
       true,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 #if defined(OS_WIN)
   // As with Mac-spacific code above, it should be in a platform-specific
   // section somewhere, but there is no good place for it.
   registry->RegisterBooleanPref(
       prefs::kSuppressSwitchToMetroModeOnSetDefault,
       false,
@@ skipping 137 matching lines @@
     scoped_refptr<user_prefs::PrefRegistrySyncable> registry(
         static_cast<user_prefs::PrefRegistrySyncable*>(
             prefs->DeprecatedGetPrefRegistry()));
     registry->RegisterDictionaryPref(
         window_pref.c_str(), user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   }
 }
 
 
 }  // namespace chrome