diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-17 02:51:05 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-17 02:51:05 +0000 |
| commit | 0bb65e96faac174c4ceac7a26ec87e1f395f35ef (patch) | |
| tree | 03e415c55a456a1d7480534464812a23bb62b600 /ash/system/tray/system_tray_bubble.cc | |
| parent | 50cc61fece7b1e46e3c960cb81191a6c742dcaa5 (diff) | |
| download | chromium_src-0bb65e96faac174c4ceac7a26ec87e1f395f35ef.zip chromium_src-0bb65e96faac174c4ceac7a26ec87e1f395f35ef.tar.gz chromium_src-0bb65e96faac174c4ceac7a26ec87e1f395f35ef.tar.bz2 | |
Re-factor system tray code controlling launcher visibility
This CL prevents the launcher from being hidden when either the web notification tray or the system tray is visible.
BUG=142506
For minor change to ash/wm/shelf_layout_manager.cc:
TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10823350
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152028 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system/tray/system_tray_bubble.cc')
| -rw-r--r-- | ash/system/tray/system_tray_bubble.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ash/system/tray/system_tray_bubble.cc b/ash/system/tray/system_tray_bubble.cc index cac7ebe..695bb9d 100644 --- a/ash/system/tray/system_tray_bubble.cc +++ b/ash/system/tray/system_tray_bubble.cc @@ -320,10 +320,12 @@ void SystemTrayBubble::BubbleViewDestroyed() { void SystemTrayBubble::OnMouseEnteredView() { StopAutoCloseTimer(); + tray_->UpdateShouldShowLauncher(); } void SystemTrayBubble::OnMouseExitedView() { RestartAutoCloseTimer(); + tray_->UpdateShouldShowLauncher(); } void SystemTrayBubble::OnClickedOutsideView() { |