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

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: Rebased. 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 78b2cb8521e688dd83d8718b46e87c5f67b749eb..cb5d5c59dfcaac9252402d17401b4cc3b4f5b97b 100644
--- a/chrome/browser/ui/chrome_pages.cc
+++ b/chrome/browser/ui/chrome_pages.cc
@@ -189,13 +189,11 @@ 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);
- model->AcknowledgeConflictNotification();
- return;
- }
+ GURL conflict_url = model->GetConflictUrl();
+ if (conflict_url.is_valid()) {
+ ShowSingletonTab(browser, conflict_url);
+ model->AcknowledgeConflictNotification();
+ return;
}
#endif
« no previous file with comments | « chrome/browser/diagnostics/recon_diagnostics.cc ('k') | chrome/browser/ui/toolbar/app_menu_icon_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698