Changes how we detect whether the launcher should be shown when

ash/system/tray/system_tray.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/tray/system_tray.h"
 
 #include "ash/shell.h"
 #include "ash/shell/panel_window.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #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"
 #include "base/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/skia_util.h"
@@ skipping 494 matching lines @@
 
   // Setup animation.
   ash::SetWindowVisibilityAnimationType(popup_->GetNativeWindow(),
       ash::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
   ash::SetWindowVisibilityAnimationTransition(popup_->GetNativeWindow(),
       ash::ANIMATE_BOTH);
   ash::SetWindowVisibilityAnimationDuration(popup_->GetNativeWindow(),
       base::TimeDelta::FromMilliseconds(kAnimationDurationForPopupMS));
 
   bubble_->Show();
+
+  Shell::GetInstance()->shelf()->UpdateAutoHideState();
 }
 
 bool SystemTray::OnKeyPressed(const views::KeyEvent& event) {
   if (event.key_code() == ui::VKEY_SPACE ||
       event.key_code() == ui::VKEY_RETURN) {
     if (popup_)
       popup_->Hide();
     else
       ShowItems(items_.get(), false, true);
     return true;
@@ skipping 27 matching lines @@
 
 void SystemTray::OnPaintFocusBorder(gfx::Canvas* canvas) {
   if (GetWidget() && GetWidget()->IsActive())
     views::View::OnPaintFocusBorder(canvas);
 }
 
 void SystemTray::OnWidgetClosing(views::Widget* widget) {
   CHECK_EQ(popup_, widget);
   popup_ = NULL;
   bubble_ = NULL;
+  Shell::GetInstance()->shelf()->UpdateAutoHideState();
 }
 
 void SystemTray::UpdateBackground(int alpha) {
   if (mouse_in_tray_)
     alpha += kTrayBackgroundHoverAlpha - kTrayBackgroundAlpha;
   background_->set_alpha(alpha);
   SchedulePaint();
 }
 
 }  // namespace ash