| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/status_icons/status_icon.h" | 5 #include "chrome/browser/status_icons/status_icon.h" |
| 6 | 6 |
| 7 #include "chrome/browser/status_icons/status_icon_observer.h" |
| 7 #include "ui/base/models/menu_model.h" | 8 #include "ui/base/models/menu_model.h" |
| 8 | 9 |
| 9 StatusIcon::StatusIcon() { | 10 StatusIcon::StatusIcon() { |
| 10 } | 11 } |
| 11 | 12 |
| 12 StatusIcon::~StatusIcon() { | 13 StatusIcon::~StatusIcon() { |
| 13 } | 14 } |
| 14 | 15 |
| 15 void StatusIcon::AddObserver(Observer* observer) { | 16 void StatusIcon::AddObserver(StatusIconObserver* observer) { |
| 16 observers_.AddObserver(observer); | 17 observers_.AddObserver(observer); |
| 17 } | 18 } |
| 18 | 19 |
| 19 void StatusIcon::RemoveObserver(Observer* observer) { | 20 void StatusIcon::RemoveObserver(StatusIconObserver* observer) { |
| 20 observers_.RemoveObserver(observer); | 21 observers_.RemoveObserver(observer); |
| 21 } | 22 } |
| 22 | 23 |
| 23 bool StatusIcon::HasObservers() { | 24 bool StatusIcon::HasObservers() const { |
| 24 return observers_.size() > 0; | 25 return observers_.size() > 0; |
| 25 } | 26 } |
| 26 | 27 |
| 27 void StatusIcon::DispatchClickEvent() { | 28 void StatusIcon::DispatchClickEvent() { |
| 28 FOR_EACH_OBSERVER(Observer, observers_, OnClicked()); | 29 FOR_EACH_OBSERVER(StatusIconObserver, observers_, OnStatusIconClicked()); |
| 29 } | 30 } |
| 30 | 31 |
| 31 void StatusIcon::SetContextMenu(ui::MenuModel* menu) { | 32 void StatusIcon::SetContextMenu(ui::MenuModel* menu) { |
| 32 context_menu_contents_.reset(menu); | 33 context_menu_contents_.reset(menu); |
| 33 UpdatePlatformContextMenu(menu); | 34 UpdatePlatformContextMenu(menu); |
| 34 } | 35 } |
| OLD | NEW |