chrome/browser/ui/chrome_pages.cc - Issue 2037883004: [Win] Add reporting of total number of modules loaded in browser process.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Remove unref'd vars from unittest. Created 4 years, 6 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

« chrome/browser/enumerate_modules_model_win.h ('K') | « chrome/browser/enumerate_modules_model_win.cc ('k') | chrome/browser/ui/toolbar/app_menu_icon_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/chrome_pages.cc

diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc

index 641086e8ac67c66bb44f39b574340e5e1015bf42..959cb70e514cd82c193fc1c93d8714c99632f09c 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()) {

+ ShowSingletonTab(browser, conflict_url);

model->AcknowledgeConflictNotification();

return;

}