chrome/browser/ui/toolbar/app_menu_model.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/toolbar/app_menu_model.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: Refactor locking, add support for catalogs. Created 4 years, 5 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

« base/lazy_instance.h ('K') | « chrome/browser/ui/toolbar/app_menu_icon_controller.cc ('k') | chrome/browser/ui/views/conflicting_module_view_win.h » ('j') | chrome/browser/win/enumerate_modules_model.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/toolbar/app_menu_model.cc

diff --git a/chrome/browser/ui/toolbar/app_menu_model.cc b/chrome/browser/ui/toolbar/app_menu_model.cc

index 9209ab16890b176ea27fe20b90b14ae227f1500e..9442a3144aed89ea42c12e0649d32327e34c3b70 100644

--- a/chrome/browser/ui/toolbar/app_menu_model.cc

+++ b/chrome/browser/ui/toolbar/app_menu_model.cc

@@ -690,16 +690,8 @@ bool AppMenuModel::IsCommandIdVisible(int command_id) const {

return false; // Always hidden (see CreateActionToolbarOverflowMenu).

#endif

#if defined(OS_WIN)

- case IDC_VIEW_INCOMPATIBILITIES: {

- EnumerateModulesModel* loaded_modules =

- EnumerateModulesModel::GetInstance();

- if (loaded_modules->confirmed_bad_modules_detected() <= 0)

- return false;

- // We'll leave the app menu adornment on until the user clicks the link.

- if (loaded_modules->modules_to_notify_about() <= 0)

- loaded_modules->AcknowledgeConflictNotification();

- return true;

- }

+ case IDC_VIEW_INCOMPATIBILITIES:

+ return EnumerateModulesModel::GetInstance()->ShouldShowConflictWarning();

case IDC_PIN_TO_START_SCREEN:

return false;

#else