Removes caching of whether the launcher should be visible from

ash/system/status_area_widget.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/status_area_widget.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
@@ skipping 285 matching lines @@
 };
 
 }  // namespace
 
 namespace internal {
 
 StatusAreaWidget::StatusAreaWidget()
     : status_area_widget_delegate_(new internal::StatusAreaWidgetDelegate),
       system_tray_(NULL),
       web_notification_tray_(NULL),
-      login_status_(user::LOGGED_IN_NONE),
-      should_show_launcher_(false) {
+      login_status_(user::LOGGED_IN_NONE) {
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   params.delegate = status_area_widget_delegate_;
   params.parent =
       Shell::GetPrimaryRootWindowController()->GetContainer(
           ash::internal::kShellWindowId_StatusContainer);
   params.transparent = true;
   Init(params);
   set_focus_on_creation(false);
   SetContentsView(status_area_widget_delegate_);
@@ skipping 18 matching lines @@
   // Destroy the trays early, causing them to be removed from the view
   // hierarchy. Do not used scoped pointers since we don't want to destroy them
   // in the destructor if Shutdown() is not called (e.g. in tests).
   system_tray_delegate_.reset();
   system_tray_ = NULL;
   delete system_tray_;
   web_notification_tray_ = NULL;
   delete web_notification_tray_;
 }
 
+bool StatusAreaWidget::ShouldShowLauncher() const {
+  if ((system_tray_ && system_tray_->HasSystemBubble()) ||
+      (web_notification_tray_ &&
+       web_notification_tray_->IsMessageCenterBubbleVisible()))
+    return true;
+
+  if (!Shell::GetInstance()->shelf()->IsVisible())
+    return false;
+
+  // If the launcher is currently visible, don't hide the launcher if the mouse
+  // is in any of the notification bubbles.
+  return (system_tray_ && system_tray_->IsMouseInNotificationBubble()) ||
+        (web_notification_tray_ &&
+         web_notification_tray_->IsMouseInNotificationBubble());
+}
+
 void StatusAreaWidget::AddSystemTray(ShellDelegate* shell_delegate) {
   system_tray_ = new SystemTray(this);
   status_area_widget_delegate_->AddTray(system_tray_);
 
   if (shell_delegate) {
     system_tray_delegate_.reset(
         shell_delegate->CreateSystemTrayDelegate(system_tray_));
   }
   if (!system_tray_delegate_.get())
     system_tray_delegate_.reset(new DummySystemTrayDelegate());
@@ skipping 40 matching lines @@
     user::LoginStatus login_status) {
   if (login_status_ == login_status)
     return;
   login_status_ = login_status;
   if (system_tray_)
     system_tray_->UpdateAfterLoginStatusChange(login_status);
   if (web_notification_tray_)
     web_notification_tray_->UpdateAfterLoginStatusChange(login_status);
 }
 
-void StatusAreaWidget::UpdateShouldShowLauncher() {
-  // If any bubble is visible, we should show the launcher.
-  bool should_show_launcher =
-      (system_tray_ && system_tray_->HasSystemBubble()) ||
-      (web_notification_tray_ &&
-       web_notification_tray_->IsMessageCenterBubbleVisible());
-  if (!should_show_launcher && Shell::GetInstance()->shelf()->IsVisible()) {
-    // If the launcher is currently visible, don't hide the launcher if
-    // the mouse is in this widget or in any notification bubbles.
-    should_show_launcher =
-        (GetWindowBoundsInScreen().Contains(
-            gfx::Screen::GetCursorScreenPoint())) ||
-        (system_tray_ && system_tray_->IsMouseInNotificationBubble()) ||
-        (web_notification_tray_ &&
-         web_notification_tray_->IsMouseInNotificationBubble());
-  }
-  if (should_show_launcher != should_show_launcher_) {
-    should_show_launcher_ = should_show_launcher;
-    Shell::GetInstance()->shelf()->UpdateAutoHideState();
-  }
-}
-
 }  // namespace internal
 }  // namespace ash