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

Unified Diff: ash/system/tray/system_tray.cc

Issue 9817026: Changes how we detect whether the launcher should be shown when (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix comment Created 8 years, 9 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
« no previous file with comments | « ash/system/tray/system_tray.h ('k') | ash/wm/shelf_layout_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/system_tray.cc
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc
index 7e442153a5b1912ef2db8543bc8d8c5717e21665..8257a8f34896817d97e2f223d35e74b2e4fdabfa 100644
--- a/ash/system/tray/system_tray.cc
+++ b/ash/system/tray/system_tray.cc
@@ -12,6 +12,7 @@
#include "ash/system/tray/system_tray_item.h"
#include "ash/system/user/login_status.h"
#include "ash/wm/shadow_types.h"
+#include "ash/wm/shelf_layout_manager.h"
#include "ash/wm/window_animations.h"
#include "base/logging.h"
#include "base/timer.h"
@@ -526,6 +527,8 @@ void SystemTray::ShowItems(std::vector<SystemTrayItem*>& items,
base::TimeDelta::FromMilliseconds(kAnimationDurationForPopupMS));
bubble_->Show();
+
+ Shell::GetInstance()->shelf()->UpdateAutoHideState();
}
bool SystemTray::OnKeyPressed(const views::KeyEvent& event) {
@@ -573,6 +576,7 @@ void SystemTray::OnWidgetClosing(views::Widget* widget) {
CHECK_EQ(popup_, widget);
popup_ = NULL;
bubble_ = NULL;
+ Shell::GetInstance()->shelf()->UpdateAutoHideState();
}
void SystemTray::UpdateBackground(int alpha) {
« no previous file with comments | « ash/system/tray/system_tray.h ('k') | ash/wm/shelf_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698