From 2bc34f038d1eb149e75c932061a475dbdb369564 Mon Sep 17 00:00:00 2001 From: "finnur@chromium.org" Date: Tue, 12 Jun 2012 12:39:58 +0000 Subject: Add another instance of a problematic DLL (different location) to the about:conflicts blacklist. BUG=None TEST=None Review URL: https://chromiumcodereview.appspot.com/10546096 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141651 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/enumerate_modules_model_win.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'chrome/browser/enumerate_modules_model_win.cc') diff --git a/chrome/browser/enumerate_modules_model_win.cc b/chrome/browser/enumerate_modules_model_win.cc index 2e4d80c..95b24d4 100644 --- a/chrome/browser/enumerate_modules_model_win.cc +++ b/chrome/browser/enumerate_modules_model_win.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -143,7 +143,10 @@ const ModuleEnumerator::BlacklistEntry ModuleEnumerator::kModuleBlacklist[] = { // cwalsp.dll, "%systemroot%\\system32\\". { "e579a039", "23d01d5b", "", "", "", kUninstallLink }, - // datamngr.dll, "%programfiles%\\windows searchqu toolbar\\". + // datamngr.dll (1), "%programfiles%\\searchqu toolbar\\datamngr\\". + { "7add320b", "470a3da3", "", "", "", kUninstallLink }, + + // datamngr.dll (2), "%programfiles%\\windows searchqu toolbar\\". { "7add320b", "7a3c8be3", "", "", "", kUninstallLink }, // dsoqq0.dll, "%temp%\\". -- cgit v1.1