Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3406)

Unified Diff: ash/system/web_notification/web_notification_tray.cc

Issue 10909220: Removes caching of whether the launcher should be visible from (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Tweaks Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/system/web_notification/web_notification_tray.cc
diff --git a/ash/system/web_notification/web_notification_tray.cc b/ash/system/web_notification/web_notification_tray.cc
index 58ce1649fdaeb787eee4882344fd0ca39a898195..ecfeb2163ba3341b66c2afa31d7f2e269b1da225 100644
--- a/ash/system/web_notification/web_notification_tray.cc
+++ b/ash/system/web_notification/web_notification_tray.cc
@@ -4,10 +4,12 @@
#include "ash/system/web_notification/web_notification_tray.h"
+#include "ash/shell.h"
#include "ash/system/status_area_widget.h"
#include "ash/system/tray/tray_bubble_view.h"
#include "ash/system/tray/tray_constants.h"
#include "ash/system/tray/tray_views.h"
+#include "ash/wm/shelf_layout_manager.h"
#include "base/bind.h"
#include "base/message_loop.h"
#include "base/stringprintf.h"
@@ -907,11 +909,9 @@ class WebNotificationTray::Bubble : public TrayBubbleView::Host,
}
virtual void OnMouseEnteredView() OVERRIDE {
- tray_->UpdateShouldShowLauncher();
sadrul 2012/09/13 23:31:26 Can this break 'do not hide launcher if mouse is i
sky 2012/09/14 00:06:35 While in AUTO_HIDE state the eventfilter in SLM is
sadrul 2012/09/14 00:10:08 Oh, cool!
}
virtual void OnMouseExitedView() OVERRIDE {
- tray_->UpdateShouldShowLauncher();
}
virtual void OnClickedOutsideView() OVERRIDE {
@@ -1157,7 +1157,7 @@ void WebNotificationTray::ShowMessageCenterBubble() {
HidePopupBubble();
message_center_bubble_.reset(new MessageCenterBubble(this));
status_area_widget()->SetHideSystemNotifications(true);
- UpdateShouldShowLauncher();
+ Shell::GetInstance()->shelf()->UpdateAutoHideState();
}
void WebNotificationTray::HideMessageCenterBubble() {
@@ -1168,7 +1168,7 @@ void WebNotificationTray::HideMessageCenterBubble() {
notification_list_->SetMessageCenterVisible(false);
UpdateTray();
status_area_widget()->SetHideSystemNotifications(false);
- UpdateShouldShowLauncher();
+ Shell::GetInstance()->shelf()->UpdateAutoHideState();
}
void WebNotificationTray::SetHidePopupBubble(bool hide) {

Powered by Google App Engine
This is Rietveld 408576698