| Index: 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 e21f6d3622b45b5a541f7f0515b8562741eb2de6..a15237613bf332bceb1ca399f43f81c3602cac33 100644
|
| --- a/chrome/browser/enumerate_modules_model_win.cc
|
| +++ b/chrome/browser/enumerate_modules_model_win.cc
|
| @@ -29,11 +29,9 @@
|
| #include "base/win/registry.h"
|
| #include "base/win/scoped_handle.h"
|
| #include "base/win/windows_version.h"
|
| -#include "chrome/browser/chrome_notification_types.h"
|
| #include "chrome/browser/net/service_providers_win.h"
|
| #include "chrome/common/chrome_constants.h"
|
| #include "chrome/grit/generated_resources.h"
|
| -#include "content/public/browser/notification_service.h"
|
| #include "crypto/sha2.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
|
|
| @@ -47,16 +45,6 @@ static const int kModuleCheckDelayMs = 45 * 1000;
|
| static const wchar_t kRegPath[] =
|
| L"Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved";
|
|
|
| -// Short-hand for things on the blacklist you should simply get rid of.
|
| -static const ModuleEnumerator::RecommendedAction kUninstallLink =
|
| - static_cast<ModuleEnumerator::RecommendedAction>(
|
| - ModuleEnumerator::UNINSTALL | ModuleEnumerator::SEE_LINK);
|
| -
|
| -// Short-hand for things on the blacklist we are investigating and have info.
|
| -static const ModuleEnumerator::RecommendedAction kInvestigatingLink =
|
| - static_cast<ModuleEnumerator::RecommendedAction>(
|
| - ModuleEnumerator::INVESTIGATING | ModuleEnumerator::SEE_LINK);
|
| -
|
| // A sort method that sorts by bad modules first, then by full name (including
|
| // path).
|
| static bool ModuleSort(const ModuleEnumerator::Module& a,
|
| @@ -138,225 +126,6 @@ ModuleEnumerator::Module::Module(ModuleType type,
|
| ModuleEnumerator::Module::~Module() {
|
| }
|
|
|
| -// The browser process module blacklist. This lists modules that are known
|
| -// to cause compatibility issues within the browser process. When adding to this
|
| -// list, make sure that all paths are lower-case, in long pathname form, end
|
| -// with a slash and use environments variables (or just look at one of the
|
| -// comments below and keep it consistent with that). When adding an entry with
|
| -// an environment variable not currently used in the list below, make sure to
|
| -// update the list in PreparePathMappings. Filename, Description/Signer, and
|
| -// Location must be entered as hashes (see GenerateHash). Filename is mandatory.
|
| -// Entries without any Description, Signer info, or Location will never be
|
| -// marked as confirmed bad (only as suspicious).
|
| -const ModuleEnumerator::BlacklistEntry ModuleEnumerator::kModuleBlacklist[] = {
|
| - // NOTE: Please keep this list sorted by dll name, then location.
|
| -
|
| - // Version 3.2.1.6 seems to be implicated in most cases (and 3.2.2.2 in some).
|
| - // There is a more recent version available for download.
|
| - // accelerator.dll, "%programfiles%\\speedbit video accelerator\\".
|
| - { "7ba9402f", "c9132d48", "", "", "", ALL, kInvestigatingLink },
|
| -
|
| - // apiqq0.dll, "%temp%\\".
|
| - { "26134911", "59145acf", "", "", "", ALL, kUninstallLink },
|
| -
|
| - // arking0.dll, "%systemroot%\\system32\\".
|
| - { "f5d8f549", "23d01d5b", "", "", "", ALL, kUninstallLink },
|
| -
|
| - // arking1.dll, "%systemroot%\\system32\\".
|
| - { "c60ca062", "23d01d5b", "", "", "", ALL, kUninstallLink },
|
| -
|
| - // aswjsflt.dll, "%ProgramFiles%\\avast software\\avast\\", "AVAST Software".
|
| - // NOTE: The digital signature of the DLL is double null terminated.
|
| - // Avast Antivirus prior to version 8.0 would kill the Chrome child process
|
| - // when blocked from running.
|
| - { "2ea5422a", "6b3a1b00", "a7db0e0c", "", "8.0", XP,
|
| - static_cast<RecommendedAction>(UPDATE | SEE_LINK | NOTIFY_USER) },
|
| -
|
| - // aswjsflt.dll, "%ProgramFiles%\\alwil software\\avast5\\", "AVAST Software".
|
| - // NOTE: The digital signature of the DLL is double null terminated.
|
| - // Avast Antivirus prior to version 8.0 would kill the Chrome child process
|
| - // when blocked from running.
|
| - { "2ea5422a", "d8686924", "a7db0e0c", "", "8.0", XP,
|
| - static_cast<RecommendedAction>(UPDATE | SEE_LINK | NOTIFY_USER) },
|
| -
|
| - // Said to belong to Killer NIC from BigFoot Networks (not verified). Versions
|
| - // 6.0.0.7 and 6.0.0.10 implicated.
|
| - // bfllr.dll, "%systemroot%\\system32\\".
|
| - { "6bb57633", "23d01d5b", "", "", "", ALL, kInvestigatingLink },
|
| -
|
| - // clickpotatolitesahook.dll, "". Different version each report.
|
| - { "0396e037.dll", "", "", "", "", ALL, kUninstallLink },
|
| -
|
| - // cvasds0.dll, "%temp%\\".
|
| - { "5ce0037c", "59145acf", "", "", "", ALL, kUninstallLink },
|
| -
|
| - // cwalsp.dll, "%systemroot%\\system32\\".
|
| - { "e579a039", "23d01d5b", "", "", "", ALL, kUninstallLink },
|
| -
|
| - // datamngr.dll (1), "%programfiles%\\searchqu toolbar\\datamngr\\".
|
| - { "7add320b", "470a3da3", "", "", "", ALL, kUninstallLink },
|
| -
|
| - // datamngr.dll (2), "%programfiles%\\windows searchqu toolbar\\".
|
| - { "7add320b", "7a3c8be3", "", "", "", ALL, kUninstallLink },
|
| -
|
| - // dsoqq0.dll, "%temp%\\".
|
| - { "1c4df325", "59145acf", "", "", "", ALL, kUninstallLink },
|
| -
|
| - // flt.dll, "%programfiles%\\tueagles\\".
|
| - { "6d01f4a1", "7935e9c2", "", "", "", ALL, kUninstallLink },
|
| -
|
| - // This looks like a malware edition of a Brazilian Bank plugin, sometimes
|
| - // referred to as Malware.Banc.A.
|
| - // gbieh.dll, "%programfiles%\\gbplugin\\".
|
| - { "4cb4f2e3", "88e4a3b1", "", "", "", ALL, kUninstallLink },
|
| -
|
| - // hblitesahook.dll. Each report has different version number in location.
|
| - { "5d10b363", "", "", "", "", ALL, kUninstallLink },
|
| -
|
| - // icf.dll, "%systemroot%\\system32\\".
|
| - { "303825ed", "23d01d5b", "", "", "", ALL, INVESTIGATING },
|
| -
|
| - // idmmbc.dll (IDM), "%systemroot%\\system32\\". See: http://crbug.com/26892/.
|
| - { "b8dce5c3", "23d01d5b", "", "", "6.03", ALL,
|
| - static_cast<RecommendedAction>(UPDATE | DISABLE) },
|
| -
|
| - // imon.dll (NOD32), "%systemroot%\\system32\\". See: http://crbug.com/21715.
|
| - { "8f42f22e", "23d01d5b", "", "", "4.0", ALL,
|
| - static_cast<RecommendedAction>(UPDATE | DISABLE) },
|
| -
|
| - // is3lsp.dll, "%commonprogramfiles%\\is3\\anti-spyware\\".
|
| - { "7ffbdce9", "bc5673f2", "", "", "", ALL,
|
| - static_cast<RecommendedAction>(UPDATE | DISABLE | SEE_LINK) },
|
| -
|
| - // jsi.dll, "%programfiles%\\profilecraze\\".
|
| - { "f9555eea", "e3548061", "", "", "", ALL, kUninstallLink },
|
| -
|
| - // kernel.dll, "%programfiles%\\contentwatch\\internet protection\\modules\\".
|
| - { "ead2768e", "4e61ce60", "", "", "", ALL, INVESTIGATING },
|
| -
|
| - // mgking0.dll, "%systemroot%\\system32\\".
|
| - { "d0893e38", "23d01d5b", "", "", "", ALL, kUninstallLink },
|
| -
|
| - // mgking0.dll, "%temp%\\".
|
| - { "d0893e38", "59145acf", "", "", "", ALL, kUninstallLink },
|
| -
|
| - // mgking1.dll, "%systemroot%\\system32\\".
|
| - { "3e837222", "23d01d5b", "", "", "", ALL, kUninstallLink },
|
| -
|
| - // mgking1.dll, "%temp%\\".
|
| - { "3e837222", "59145acf", "", "", "", ALL, kUninstallLink },
|
| -
|
| - // mstcipha.ime, "%systemroot%\\system32\\".
|
| - { "5523579e", "23d01d5b", "", "", "", ALL, INVESTIGATING },
|
| -
|
| - // mwtsp.dll, "%systemroot%\\system32\\".
|
| - { "9830bff6", "23d01d5b", "", "", "", ALL, kUninstallLink },
|
| -
|
| - // nodqq0.dll, "%temp%\\".
|
| - { "b86ce04d", "59145acf", "", "", "", ALL, kUninstallLink },
|
| -
|
| - // nProtect GameGuard Anti-cheat system. Every report has a different
|
| - // location, since it is installed into and run from a game folder. Various
|
| - // versions implicated.
|
| - // npggnt.des, no fixed location.
|
| - { "f2c8790d", "", "", "", "", ALL, kInvestigatingLink },
|
| -
|
| - // nvlsp.dll,
|
| - // "%programfiles%\\nvidia corporation\\networkaccessmanager\\bin32\\".
|
| - { "37f907e2", "3ad0ff23", "", "", "", ALL, INVESTIGATING },
|
| -
|
| - // post0.dll, "%systemroot%\\system32\\".
|
| - { "7405c0c8", "23d01d5b", "", "", "", ALL, kUninstallLink },
|
| -
|
| - // questbrwsearch.dll, "%programfiles%\\questbrwsearch\\".
|
| - { "0953ed09", "f0d5eeda", "", "", "", ALL, kUninstallLink },
|
| -
|
| - // questscan.dll, "%programfiles%\\questscan\\".
|
| - { "f4f3391e", "119d20f7", "", "", "", ALL, kUninstallLink },
|
| -
|
| - // radhslib.dll (Naomi web filter), "%programfiles%\\rnamfler\\".
|
| - // See http://crbug.com/12517.
|
| - { "7edcd250", "0733dc3e", "", "", "", ALL, INVESTIGATING },
|
| -
|
| - // rlls.dll, "%programfiles%\\relevantknowledge\\".
|
| - { "a1ed94a7", "ea9d6b36", "", "", "", ALL, kUninstallLink },
|
| -
|
| - // rooksdol.dll, "%programfiles%\\trusteer\\rapport\\bin\\".
|
| - { "802aefef", "06120e13", "", "", "3.5.1008.40", ALL, UPDATE },
|
| -
|
| - // scanquery.dll, "%programfiles%\\scanquery\\".
|
| - { "0b52d2ae", "a4cc88b1", "", "", "", ALL, kUninstallLink },
|
| -
|
| - // sdata.dll, "%programdata%\\srtserv\\".
|
| - { "1936d5cc", "223c44be", "", "", "", ALL, kUninstallLink },
|
| -
|
| - // searchtree.dll,
|
| - // "%programfiles%\\contentwatch\\internet protection\\modules\\".
|
| - { "f6915a31", "4e61ce60", "", "", "", ALL, INVESTIGATING },
|
| -
|
| - // sgprxy.dll, "%commonprogramfiles%\\is3\\anti-spyware\\".
|
| - { "005965ea", "bc5673f2", "", "", "", ALL, INVESTIGATING },
|
| -
|
| - // snxhk.dll, "%ProgramFiles%\\avast software\\avast\\", "AVAST Software".
|
| - // NOTE: The digital signature of the DLL is double null terminated.
|
| - // Avast Antivirus prior to version 8.0 would kill the Chrome child process
|
| - // when blocked from running.
|
| - { "46c16aa8", "6b3a1b00", "a7db0e0c", "", "8.0", XP,
|
| - static_cast<RecommendedAction>(UPDATE | SEE_LINK | NOTIFY_USER) },
|
| -
|
| - // snxhk.dll, "%ProgramFiles%\\alwil software\\avast5\\", "AVAST Software".
|
| - // NOTE: The digital signature of the DLL is double null terminated.
|
| - // Avast Antivirus prior to version 8.0 would kill the Chrome child process
|
| - // when blocked from running.
|
| - { "46c16aa8", "d8686924", "a7db0e0c", "", "8.0", XP,
|
| - static_cast<RecommendedAction>(UPDATE | SEE_LINK | NOTIFY_USER) },
|
| -
|
| - // sprotector.dll, "". Different location each report.
|
| - { "24555d74", "", "", "", "", ALL, kUninstallLink },
|
| -
|
| - // swi_filter_0001.dll (Sophos Web Intelligence),
|
| - // "%programfiles%\\sophos\\sophos anti-virus\\web intelligence\\".
|
| - // A small random sample all showed version 1.0.5.0.
|
| - { "61112d7b", "25fb120f", "", "", "", ALL, kInvestigatingLink },
|
| -
|
| - // twking0.dll, "%systemroot%\\system32\\".
|
| - { "0355549b", "23d01d5b", "", "", "", ALL, kUninstallLink },
|
| -
|
| - // twking1.dll, "%systemroot%\\system32\\".
|
| - { "02e44508", "23d01d5b", "", "", "", ALL, kUninstallLink },
|
| -
|
| - // vksaver.dll, "%systemroot%\\system32\\".
|
| - { "c4a784d5", "23d01d5b", "", "", "", ALL, kUninstallLink },
|
| -
|
| - // vlsp.dll (Venturi Firewall?), "%systemroot%\\system32\\".
|
| - { "2e4eb93d", "23d01d5b", "", "", "", ALL, INVESTIGATING },
|
| -
|
| - // vmn3_1dn.dll, "%appdata%\\roaming\\vmndtxtb\\".
|
| - { "bba2037d", "9ab68585", "", "", "", ALL, kUninstallLink },
|
| -
|
| - // webanalyzer.dll,
|
| - // "%programfiles%\\contentwatch\\internet protection\\modules\\".
|
| - { "c70b697d", "4e61ce60", "", "", "", ALL, INVESTIGATING },
|
| -
|
| - // wowst0.dll, "%systemroot%\\system32\\".
|
| - { "38ad9963", "23d01d5b", "", "", "", ALL, kUninstallLink },
|
| -
|
| - // wxbase28u_vc_cw.dll, "%systemroot%\\system32\\".
|
| - { "e967210d", "23d01d5b", "", "", "", ALL, kUninstallLink },
|
| -};
|
| -
|
| -// Generates an 8 digit hash from the input given.
|
| -static void GenerateHash(const std::string& input, std::string* output) {
|
| - if (input.empty()) {
|
| - *output = "";
|
| - return;
|
| - }
|
| -
|
| - uint8_t hash[4];
|
| - crypto::SHA256HashString(input, hash, sizeof(hash));
|
| - *output = base::ToLowerASCII(base::HexEncode(hash, sizeof(hash)));
|
| -}
|
| -
|
| // -----------------------------------------------------------------------------
|
|
|
| // static
|
| @@ -387,77 +156,6 @@ void ModuleEnumerator::NormalizeModule(Module* module) {
|
| module->normalized = true;
|
| }
|
|
|
| -// static
|
| -ModuleEnumerator::ModuleStatus ModuleEnumerator::Match(
|
| - const ModuleEnumerator::Module& module,
|
| - const ModuleEnumerator::BlacklistEntry& blacklisted) {
|
| - // All modules must be normalized before matching against blacklist.
|
| - DCHECK(module.normalized);
|
| - // Filename is mandatory and version should not contain spaces.
|
| - DCHECK(strlen(blacklisted.filename) > 0);
|
| - DCHECK(!strstr(blacklisted.version_from, " "));
|
| - DCHECK(!strstr(blacklisted.version_to, " "));
|
| -
|
| - base::win::Version version = base::win::GetVersion();
|
| - switch (version) {
|
| - case base::win::VERSION_XP:
|
| - if (!(blacklisted.os & XP)) return NOT_MATCHED;
|
| - break;
|
| - default:
|
| - break;
|
| - }
|
| -
|
| - std::string filename_hash, location_hash;
|
| - GenerateHash(base::WideToUTF8(module.name), &filename_hash);
|
| - GenerateHash(base::WideToUTF8(module.location), &location_hash);
|
| -
|
| - // Filenames are mandatory. Location is mandatory if given.
|
| - if (filename_hash == blacklisted.filename &&
|
| - (std::string(blacklisted.location).empty() ||
|
| - location_hash == blacklisted.location)) {
|
| - // We have a name match against the blacklist (and possibly location match
|
| - // also), so check version.
|
| - Version module_version(base::UTF16ToASCII(module.version));
|
| - Version version_min(blacklisted.version_from);
|
| - Version version_max(blacklisted.version_to);
|
| - bool version_ok = !version_min.IsValid() && !version_max.IsValid();
|
| - if (!version_ok) {
|
| - bool too_low = version_min.IsValid() &&
|
| - (!module_version.IsValid() ||
|
| - module_version.CompareTo(version_min) < 0);
|
| - bool too_high = version_max.IsValid() &&
|
| - (!module_version.IsValid() ||
|
| - module_version.CompareTo(version_max) >= 0);
|
| - version_ok = !too_low && !too_high;
|
| - }
|
| -
|
| - if (version_ok) {
|
| - // At this point, the names match and there is no version specified
|
| - // or the versions also match.
|
| -
|
| - std::string desc_or_signer(blacklisted.desc_or_signer);
|
| - std::string signer_hash, description_hash;
|
| - GenerateHash(base::WideToUTF8(module.digital_signer), &signer_hash);
|
| - GenerateHash(base::WideToUTF8(module.description), &description_hash);
|
| -
|
| - // If signatures match (or both are empty), then we have a winner.
|
| - if (signer_hash == desc_or_signer)
|
| - return CONFIRMED_BAD;
|
| -
|
| - // If descriptions match (or both are empty) and the locations match, then
|
| - // we also have a confirmed match.
|
| - if (description_hash == desc_or_signer &&
|
| - !location_hash.empty() && location_hash == blacklisted.location)
|
| - return CONFIRMED_BAD;
|
| -
|
| - // We are not sure, but it is likely bad.
|
| - return SUSPECTED_BAD;
|
| - }
|
| - }
|
| -
|
| - return NOT_MATCHED;
|
| -}
|
| -
|
| ModuleEnumerator::ModuleEnumerator(EnumerateModulesModel* observer)
|
| : enumerated_modules_(NULL),
|
| observer_(observer),
|
| @@ -511,7 +209,9 @@ void ModuleEnumerator::ScanImpl() {
|
| UMA_HISTOGRAM_TIMES("Conflicts.EnumerateWinsockModules",
|
| checkpoint2 - checkpoint);
|
|
|
| - MatchAgainstBlacklist();
|
| + // TODO(chrisha): Annotate any modules that are suspicious/bad.
|
| +
|
| + ReportThirdPartyMetrics();
|
|
|
| std::sort(enumerated_modules_->begin(),
|
| enumerated_modules_->end(), ModuleSort);
|
| @@ -709,48 +409,6 @@ void ModuleEnumerator::CollapsePath(Module* entry) {
|
| }
|
| }
|
|
|
| -void ModuleEnumerator::MatchAgainstBlacklist() {
|
| - for (size_t m = 0; m < enumerated_modules_->size(); ++m) {
|
| - // Match this module against the blacklist.
|
| - Module* module = &(*enumerated_modules_)[m];
|
| - module->status = GOOD; // We change this below potentially.
|
| - for (size_t i = 0; i < arraysize(kModuleBlacklist); ++i) {
|
| - #if !defined(NDEBUG)
|
| - // This saves time when constructing the blacklist.
|
| - std::string hashes(kModuleBlacklist[i].filename);
|
| - std::string hash1, hash2, hash3;
|
| - GenerateHash(kModuleBlacklist[i].filename, &hash1);
|
| - hashes += " - " + hash1;
|
| - GenerateHash(kModuleBlacklist[i].location, &hash2);
|
| - hashes += " - " + hash2;
|
| - GenerateHash(kModuleBlacklist[i].desc_or_signer, &hash3);
|
| - hashes += " - " + hash3;
|
| - #endif
|
| -
|
| - ModuleStatus status = Match(*module, kModuleBlacklist[i]);
|
| - if (status != NOT_MATCHED) {
|
| - // We have a match against the blacklist. Mark it as such.
|
| - module->status = status;
|
| - module->recommended_action = kModuleBlacklist[i].help_tip;
|
| - break;
|
| - }
|
| - }
|
| -
|
| - // Modules loaded from these locations are frequently malicious
|
| - // and notorious for changing frequently so they are not good candidates
|
| - // for blacklisting individually. Mark them as suspicious if we haven't
|
| - // classified them as bad yet.
|
| - if (module->status == NOT_MATCHED || module->status == GOOD) {
|
| - if (base::StartsWith(module->location, L"%temp%",
|
| - base::CompareCase::INSENSITIVE_ASCII) ||
|
| - base::StartsWith(module->location, L"%tmp%",
|
| - base::CompareCase::INSENSITIVE_ASCII)) {
|
| - module->status = SUSPECTED_BAD;
|
| - }
|
| - }
|
| - }
|
| -}
|
| -
|
| void ModuleEnumerator::ReportBack() {
|
| if (!limited_mode_)
|
| DCHECK_CURRENTLY_ON(callback_thread_id_);
|
| @@ -839,8 +497,36 @@ base::string16 ModuleEnumerator::GetSubjectNameFromDigitalSignature(
|
| return subject_name;
|
| }
|
|
|
| +void ModuleEnumerator::ReportThirdPartyMetrics() {
|
| + size_t signed_modules = 0;
|
| + size_t microsoft_modules = 0;
|
| + for (const auto module : *enumerated_modules_) {
|
| + if (!module.digital_signer.empty()) {
|
| + ++signed_modules;
|
| + if (module.digital_signer.find(L"Microsoft") != base::string16::npos)
|
| + ++microsoft_modules;
|
| + }
|
| + }
|
| +
|
| + // Report back some metrics regarding third party modules.
|
| + UMA_HISTOGRAM_CUSTOM_COUNTS("ThirdPartyModules.Modules.Signed",
|
| + signed_modules, 1, 500, 50);
|
| + UMA_HISTOGRAM_CUSTOM_COUNTS("ThirdPartyModules.Modules.Signed.Microsoft",
|
| + microsoft_modules, 1, 500, 50);
|
| + UMA_HISTOGRAM_CUSTOM_COUNTS("ThirdPartyModules.Modules.Total",
|
| + enumerated_modules_->size(), 1, 500, 50);
|
| +}
|
| +
|
| // ----------------------------------------------------------------------------
|
|
|
| +void EnumerateModulesModel::Observer::OnScanCompleted(bool limited_mode) {
|
| + return;
|
| +}
|
| +
|
| +void EnumerateModulesModel::Observer::OnConflictsAcknowledged() {
|
| + return;
|
| +}
|
| +
|
| // static
|
| EnumerateModulesModel* EnumerateModulesModel::GetInstance() {
|
| return base::Singleton<EnumerateModulesModel>::get();
|
| @@ -860,10 +546,7 @@ bool EnumerateModulesModel::ShouldShowConflictWarning() const {
|
| void EnumerateModulesModel::AcknowledgeConflictNotification() {
|
| if (!conflict_notification_acknowledged_) {
|
| conflict_notification_acknowledged_ = true;
|
| - content::NotificationService::current()->Notify(
|
| - chrome::NOTIFICATION_MODULE_INCOMPATIBILITY_ICON_CHANGE,
|
| - content::Source<EnumerateModulesModel>(this),
|
| - content::NotificationService::NoDetails());
|
| + observers_->Notify(FROM_HERE, &Observer::OnConflictsAcknowledged);
|
| }
|
| }
|
|
|
| @@ -964,8 +647,8 @@ base::ListValue* EnumerateModulesModel::GetModuleList() const {
|
| L" " + actions;
|
| }
|
| data->SetString("possibleResolution", possible_resolution);
|
| - data->SetString("help_url",
|
| - ConstructHelpCenterUrl(*module).spec().c_str());
|
| + // TODO(chrisha): Set help_url when we have a meaningful place for users
|
| + // to land.
|
| }
|
|
|
| list->Append(data);
|
| @@ -975,28 +658,12 @@ base::ListValue* EnumerateModulesModel::GetModuleList() const {
|
| return list;
|
| }
|
|
|
| -GURL EnumerateModulesModel::GetFirstNotableConflict() {
|
| - lock->Acquire();
|
| - GURL url;
|
| -
|
| - if (enumerated_modules_.empty()) {
|
| - lock->Release();
|
| - return GURL();
|
| - }
|
| -
|
| - for (ModuleEnumerator::ModulesVector::const_iterator module =
|
| - enumerated_modules_.begin();
|
| - module != enumerated_modules_.end(); ++module) {
|
| - if (!(module->recommended_action & ModuleEnumerator::NOTIFY_USER))
|
| - continue;
|
| -
|
| - url = ConstructHelpCenterUrl(*module);
|
| - DCHECK(url.is_valid());
|
| - break;
|
| - }
|
| -
|
| - lock->Release();
|
| - return url;
|
| +GURL EnumerateModulesModel::GetConflictUrl() {
|
| + // For now, simply bring up the chrome://conflicts page, which has detailed
|
| + // information about each module.
|
| + if (ShouldShowConflictWarning())
|
| + return GURL(L"chrome://conflicts");
|
| + return GURL();
|
| }
|
|
|
| EnumerateModulesModel::EnumerateModulesModel()
|
| @@ -1005,7 +672,8 @@ EnumerateModulesModel::EnumerateModulesModel()
|
| conflict_notification_acknowledged_(false),
|
| confirmed_bad_modules_detected_(0),
|
| modules_to_notify_about_(0),
|
| - suspected_bad_modules_detected_(0) {
|
| + suspected_bad_modules_detected_(0),
|
| + observers_(new base::ObserverListThreadSafe<Observer>()) {
|
| lock = new base::Lock();
|
| }
|
|
|
| @@ -1017,11 +685,9 @@ void EnumerateModulesModel::MaybePostScanningTask() {
|
| static bool done = false;
|
| if (!done) {
|
| done = true;
|
| - if (base::win::GetVersion() == base::win::VERSION_XP) {
|
| - check_modules_timer_.Start(FROM_HERE,
|
| - base::TimeDelta::FromMilliseconds(kModuleCheckDelayMs),
|
| - this, &EnumerateModulesModel::ScanNow);
|
| - }
|
| + check_modules_timer_.Start(FROM_HERE,
|
| + base::TimeDelta::FromMilliseconds(kModuleCheckDelayMs),
|
| + this, &EnumerateModulesModel::ScanNow);
|
| }
|
| }
|
|
|
| @@ -1051,32 +717,6 @@ void EnumerateModulesModel::DoneScanning() {
|
| UMA_HISTOGRAM_COUNTS_100("Conflicts.ConfirmedBadModules",
|
| confirmed_bad_modules_detected_);
|
|
|
| - // Notifications are not available in limited mode.
|
| - if (limited_mode_)
|
| - return;
|
| -
|
| - content::NotificationService::current()->Notify(
|
| - chrome::NOTIFICATION_MODULE_LIST_ENUMERATED,
|
| - content::Source<EnumerateModulesModel>(this),
|
| - content::NotificationService::NoDetails());
|
| -}
|
| -
|
| -GURL EnumerateModulesModel::ConstructHelpCenterUrl(
|
| - const ModuleEnumerator::Module& module) const {
|
| - if (!(module.recommended_action & ModuleEnumerator::SEE_LINK) &&
|
| - !(module.recommended_action & ModuleEnumerator::NOTIFY_USER))
|
| - return GURL();
|
| -
|
| - // Construct the needed hashes.
|
| - std::string filename, location, description, signer;
|
| - GenerateHash(base::WideToUTF8(module.name), &filename);
|
| - GenerateHash(base::WideToUTF8(module.location), &location);
|
| - GenerateHash(base::WideToUTF8(module.description), &description);
|
| - GenerateHash(base::WideToUTF8(module.digital_signer), &signer);
|
| -
|
| - base::string16 url =
|
| - l10n_util::GetStringFUTF16(IDS_HELP_CENTER_VIEW_CONFLICTS,
|
| - base::ASCIIToUTF16(filename), base::ASCIIToUTF16(location),
|
| - base::ASCIIToUTF16(description), base::ASCIIToUTF16(signer));
|
| - return GURL(base::UTF16ToUTF8(url));
|
| + // Forward the callback to any registered observers.
|
| + observers_->Notify(FROM_HERE, &Observer::OnScanCompleted, limited_mode_);
|
| }
|
|
|