summaryrefslogtreecommitdiffstats
path: root/ash/system/status_area_widget.cc
diff options
context:
space:
mode:
authordpapad@chromium.org <dpapad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-21 20:58:52 +0000
committerdpapad@chromium.org <dpapad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-21 20:58:52 +0000
commit58e4f1d662ec12939a204e5986e8a0047b1f954d (patch)
tree6fffd9d97156e070ba2584597062af67094a9a39 /ash/system/status_area_widget.cc
parentb6196011f627324a9ac69245454a139cdc3b772d (diff)
downloadchromium_src-58e4f1d662ec12939a204e5986e8a0047b1f954d.zip
chromium_src-58e4f1d662ec12939a204e5986e8a0047b1f954d.tar.gz
chromium_src-58e4f1d662ec12939a204e5986e8a0047b1f954d.tar.bz2
Revert 158066 - Disallow the shelf from hiding when the mouse is between the message bubble and the shelf area.
When a message bubble is open and the user moves the mouse towards the shelf, the shelf will disappear when he crosses the gap between the two elements. This change is extending the shelf between the two when a message is visible. BUG=143178 TEST=unit test & visual Review URL: https://chromiumcodereview.appspot.com/10943038 TBR=skuhne@chromium.org Review URL: https://codereview.chromium.org/10969042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158071 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system/status_area_widget.cc')
-rw-r--r--ash/system/status_area_widget.cc6
1 files changed, 0 insertions, 6 deletions
diff --git a/ash/system/status_area_widget.cc b/ash/system/status_area_widget.cc
index 9370625..ec610ab 100644
--- a/ash/system/status_area_widget.cc
+++ b/ash/system/status_area_widget.cc
@@ -360,12 +360,6 @@ bool StatusAreaWidget::ShouldShowLauncher() const {
web_notification_tray_->IsMouseInNotificationBubble());
}
-bool StatusAreaWidget::IsMessageBubbleShown() const {
- return ((system_tray_ && system_tray_->IsAnyBubbleVisible()) ||
- (web_notification_tray_ &&
- web_notification_tray_->IsMessageCenterBubbleVisible()));
-}
-
void StatusAreaWidget::AddSystemTray(ShellDelegate* shell_delegate) {
system_tray_ = new SystemTray(this);
status_area_widget_delegate_->AddTray(system_tray_);