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

Unified Diff: chrome/browser/ui/chrome_pages.cc

Issue 2037883004: [Win] Add reporting of total number of modules loaded in browser process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Small fixes. Created 4 years, 4 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/ui/chrome_pages.cc
diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc
index 3ed57f8f97f904507c79f0643d27892b620c2b47..c68267dfe0ebcb3bbdffc79325767920d58f4804 100644
--- a/chrome/browser/ui/chrome_pages.cc
+++ b/chrome/browser/ui/chrome_pages.cc
@@ -184,10 +184,10 @@ void ShowExtensions(Browser* browser,
void ShowConflicts(Browser* browser) {
#if defined(OS_WIN)
EnumerateModulesModel* model = EnumerateModulesModel::GetInstance();
- if (model->modules_to_notify_about() > 0) {
- GURL help_center_url = model->GetFirstNotableConflict();
- if (help_center_url.is_valid()) {
- ShowSingletonTab(browser, help_center_url);
+ if (model->ShouldShowConflictWarning()) {
+ GURL conflict_url = model->GetConflictUrl();
+ if (conflict_url.is_valid()) {
Peter Kasting 2016/08/05 00:10:08 I don't think the system should be set up so you n
chrisha 2016/08/12 19:04:40 Collapsed logic into GetConflictUrl.
+ ShowSingletonTab(browser, conflict_url);
model->AcknowledgeConflictNotification();
return;
}

Powered by Google App Engine
This is Rietveld 408576698