Index: chrome/browser/status_icons/status_icon.cc |
diff --git a/chrome/browser/status_icons/status_icon.cc b/chrome/browser/status_icons/status_icon.cc |
index 04909ad4cc2b0f305e14576e81977b4c5938fe2d..d1b18b62361c78a7a6dd2d61495bd1d442ae11b9 100644 |
--- a/chrome/browser/status_icons/status_icon.cc |
+++ b/chrome/browser/status_icons/status_icon.cc |
@@ -4,6 +4,7 @@ |
#include "chrome/browser/status_icons/status_icon.h" |
+#include "chrome/browser/status_icons/status_icon_observer.h" |
#include "ui/base/models/menu_model.h" |
StatusIcon::StatusIcon() { |
@@ -12,20 +13,20 @@ StatusIcon::StatusIcon() { |
StatusIcon::~StatusIcon() { |
} |
-void StatusIcon::AddObserver(Observer* observer) { |
+void StatusIcon::AddObserver(StatusIconObserver* observer) { |
observers_.AddObserver(observer); |
} |
-void StatusIcon::RemoveObserver(Observer* observer) { |
+void StatusIcon::RemoveObserver(StatusIconObserver* observer) { |
observers_.RemoveObserver(observer); |
} |
-bool StatusIcon::HasObservers() { |
+bool StatusIcon::HasObservers() const { |
return observers_.size() > 0; |
} |
void StatusIcon::DispatchClickEvent() { |
- FOR_EACH_OBSERVER(Observer, observers_, OnClicked()); |
+ FOR_EACH_OBSERVER(StatusIconObserver, observers_, OnStatusIconClicked()); |
} |
void StatusIcon::SetContextMenu(ui::MenuModel* menu) { |