summaryrefslogtreecommitdiffstats
path: root/chrome/browser/enumerate_modules_model_win.h
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-29 22:19:18 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-29 22:19:18 +0000
commitc8965289996843e686084e86036db4cfe5b1713f (patch)
treec620ac44318bc26d005b5202edad36270270ed7d /chrome/browser/enumerate_modules_model_win.h
parentb11845a63868bcd1e9d2ffd5f0cde2cbdb3a41ca (diff)
downloadchromium_src-c8965289996843e686084e86036db4cfe5b1713f.zip
chromium_src-c8965289996843e686084e86036db4cfe5b1713f.tar.gz
chromium_src-c8965289996843e686084e86036db4cfe5b1713f.tar.bz2
EnumerateModules: Address UI review comments.
Make it a simple list with columns. Sort by status (conflicts at the top), then by location and module name. Also, convert the type of DLL to an enum so we can dedup the list (and for non-loaded DLLs show that they are not loaded yet, but are of type: Shell Extension / WinSock. Make sure lower bound version specified on the blacklist is inclusive (first version that broke) and the higher bound version is exclusive (first version that worked). This allows us to pointpoint exactly when the failure started and when the fix was introduced, instead of doing 0.9999 shenanigans. Specify an upper bound for the idmmbc.dll conflict, since Henry's outreach produced a fix in version 6.03 of the download manager. BUG=51105 TEST=Unit test Review URL: http://codereview.chromium.org/5278012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67598 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/enumerate_modules_model_win.h')
-rw-r--r--chrome/browser/enumerate_modules_model_win.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/enumerate_modules_model_win.h b/chrome/browser/enumerate_modules_model_win.h
index cf65eaf..9000a6c 100644
--- a/chrome/browser/enumerate_modules_model_win.h
+++ b/chrome/browser/enumerate_modules_model_win.h
@@ -29,9 +29,9 @@ class ModuleEnumerator : public base::RefCountedThreadSafe<ModuleEnumerator> {
// modules of interest and may or may not be loaded in the process at the
// time of scan.
enum ModuleType {
- LOADED_MODULE,
- SHELL_EXTENSION,
- WINSOCK_MODULE_REGISTRATION,
+ LOADED_MODULE = 1 << 0,
+ SHELL_EXTENSION = 1 << 1,
+ WINSOCK_MODULE_REGISTRATION = 1 << 2,
};
// The blacklist status of the module. Suspected Bad modules have been
@@ -96,8 +96,8 @@ class ModuleEnumerator : public base::RefCountedThreadSafe<ModuleEnumerator> {
const char* filename;
const char* location;
const char* desc_or_signer;
- const char* version_from;
- const char* version_to;
+ const char* version_from; // Version where conflict started.
+ const char* version_to; // First version that works.
RecommendedAction help_tip;
};