Index: chrome/browser/ui/views/conflicting_module_view_win.h |
diff --git a/chrome/browser/ui/views/conflicting_module_view_win.h b/chrome/browser/ui/views/conflicting_module_view_win.h |
index 14dd4a7aace1a9b81047db83abac4799d7befe1d..3a68685acb4151dfcee9e9dfee2dc6255db3f62a 100644 |
--- a/chrome/browser/ui/views/conflicting_module_view_win.h |
+++ b/chrome/browser/ui/views/conflicting_module_view_win.h |
@@ -6,8 +6,8 @@ |
#define CHROME_BROWSER_UI_VIEWS_CONFLICTING_MODULE_VIEW_WIN_H_ |
#include "base/macros.h" |
-#include "content/public/browser/notification_observer.h" |
-#include "content/public/browser/notification_registrar.h" |
+#include "base/scoped_observer.h" |
+#include "chrome/browser/win/enumerate_modules_model.h" |
#include "ui/views/bubble/bubble_dialog_delegate.h" |
#include "url/gurl.h" |
@@ -16,7 +16,7 @@ class Browser; |
// This is the class that implements the UI for the bubble showing that there |
// is a 3rd party module loaded that conflicts with Chrome. |
class ConflictingModuleView : public views::BubbleDialogDelegateView, |
- public content::NotificationObserver { |
+ public EnumerateModulesModel::Observer { |
public: |
ConflictingModuleView(views::View* anchor_view, |
Browser* browser, |
@@ -40,15 +40,13 @@ class ConflictingModuleView : public views::BubbleDialogDelegateView, |
// views::View implementation. |
void GetAccessibleState(ui::AXViewState* state) override; |
- // content::NotificationObserver implementation. |
- void Observe( |
- int type, |
- const content::NotificationSource& source, |
- const content::NotificationDetails& details) override; |
+ // EnumerateModulesModel::Observer: |
+ void OnConflictsAcknowledged() override; |
Browser* browser_; |
- content::NotificationRegistrar registrar_; |
+ ScopedObserver<EnumerateModulesModel, |
+ EnumerateModulesModel::Observer> observer_; |
// The link to the help center for this conflict. |
GURL help_center_url_; |