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

Unified Diff: chrome/browser/enumerate_modules_model_win.cc

Issue 1966643002: Integrate new MD update menu icons. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Uses the BadgeType to select the severity-warning icon. Created 4 years, 7 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
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 a199a9f76ca9492001c4ef75fea9ac0951f45a5b..b467fdcfb9a7c24ed23c3ac811f3fe7a945791d0 100644
--- a/chrome/browser/enumerate_modules_model_win.cc
+++ b/chrome/browser/enumerate_modules_model_win.cc
@@ -32,6 +32,7 @@
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/net/service_providers_win.h"
#include "chrome/common/chrome_constants.h"
+#include "chrome/common/chrome_switches.h"
#include "chrome/grit/generated_resources.h"
#include "content/public/browser/notification_service.h"
#include "crypto/sha2.h"
@@ -106,6 +107,11 @@ bool ConvertToLongPath(const base::string16& short_path,
return false;
}
+bool SimulateBadModules() {
+ const base::CommandLine& cmd_line = *base::CommandLine::ForCurrentProcess();
+ return cmd_line.HasSwitch(switches::kSimulateBadModules);
+}
+
} // namespace
ModuleEnumerator::Module::Module() {
@@ -854,7 +860,7 @@ bool EnumerateModulesModel::ShouldShowConflictWarning() const {
if (conflict_notification_acknowledged_)
return false;
- return confirmed_bad_modules_detected_ > 0;
+ return SimulateBadModules() || (confirmed_bad_modules_detected_ > 0);
}
void EnumerateModulesModel::AcknowledgeConflictNotification() {
« no previous file with comments | « no previous file | chrome/browser/ui/views/toolbar/app_menu_button.h » ('j') | chrome/browser/ui/views/toolbar/app_menu_button.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698