summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/chromeos/notifications/balloon_view.h4
-rw-r--r--chrome/browser/chromeos/notifications/notification_panel.cc8
-rw-r--r--chrome/browser/chromeos/notifications/notification_panel.h2
3 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/chromeos/notifications/balloon_view.h b/chrome/browser/chromeos/notifications/balloon_view.h
index 2086d5b..fa51883 100644
--- a/chrome/browser/chromeos/notifications/balloon_view.h
+++ b/chrome/browser/chromeos/notifications/balloon_view.h
@@ -56,12 +56,12 @@ class BalloonViewImpl : public BalloonView,
gfx::Size GetSize() const;
// True if the notification is stale. False if the notification is new.
- bool stale() {
+ bool stale() const {
return stale_;
}
// Makes the notification stable.
- void make_stale() {
+ void set_stale() {
stale_ = true;
}
diff --git a/chrome/browser/chromeos/notifications/notification_panel.cc b/chrome/browser/chromeos/notifications/notification_panel.cc
index f16f690..724c451 100644
--- a/chrome/browser/chromeos/notifications/notification_panel.cc
+++ b/chrome/browser/chromeos/notifications/notification_panel.cc
@@ -107,7 +107,7 @@ class BalloonSubContainer : public views::View {
for (int i = GetChildViewCount() - 1; i >= 0; --i) {
BalloonViewImpl* view =
static_cast<BalloonViewImpl*>(GetChildViewAt(i));
- view->make_stale();
+ view->set_stale();
}
}
@@ -418,13 +418,13 @@ void NotificationPanel::StartStaleTimer(Balloon* balloon) {
MessageLoop::current()->PostDelayedTask(
FROM_HERE,
task_factory_.NewRunnableMethod(
- &NotificationPanel::StaleNotification, view),
+ &NotificationPanel::OnStale, view),
1000 * kStaleTimeoutInSeconds);
}
-void NotificationPanel::StaleNotification(BalloonViewImpl* view) {
+void NotificationPanel::OnStale(BalloonViewImpl* view) {
if (balloon_container_->HasBalloonView(view) && !view->stale()) {
- view->make_stale();
+ view->set_stale();
if (balloon_container_->HasStickyNotifications()) {
state_ = STICKY_AND_NEW;
} else {
diff --git a/chrome/browser/chromeos/notifications/notification_panel.h b/chrome/browser/chromeos/notifications/notification_panel.h
index 6a5f8cd..cd9bf49 100644
--- a/chrome/browser/chromeos/notifications/notification_panel.h
+++ b/chrome/browser/chromeos/notifications/notification_panel.h
@@ -106,7 +106,7 @@ class NotificationPanel : public PanelController::Delegate,
// A callback function that is called when the notification
// (that the view is associated with) becomes stale after a timeout.
- void StaleNotification(BalloonViewImpl* view);
+ void OnStale(BalloonViewImpl* view);
BalloonContainer* balloon_container_;
scoped_ptr<views::Widget> panel_widget_;