| 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
|
|
|
|
|