Fix shelf auto-hide calculation for app-list visibility.

ash/common/shelf/app_list_button.cc

 // Copyright 2014 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/common/shelf/app_list_button.h"
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/ink_drop_button_listener.h"
 #include "ash/common/shelf/shelf_constants.h"
@@ skipping 15 matching lines @@
 #include "ui/views/animation/ink_drop_impl.h"
 #include "ui/views/animation/ink_drop_mask.h"
 #include "ui/views/painter.h"
 
 namespace ash {
 
 AppListButton::AppListButton(InkDropButtonListener* listener,
                              ShelfView* shelf_view,
                              WmShelf* wm_shelf)
     : views::ImageButton(nullptr),
-      draw_background_as_active_(false),
-      background_alpha_(0),
       listener_(listener),
       shelf_view_(shelf_view),
       wm_shelf_(wm_shelf) {
   DCHECK(listener_);
   DCHECK(shelf_view_);
   DCHECK(wm_shelf_);
   if (ash::MaterialDesignController::IsShelfMaterial()) {
     SetInkDropMode(InkDropMode::ON_NO_GESTURE_HANDLER);
     set_ink_drop_base_color(kShelfInkDropBaseColor);
     set_ink_drop_visible_opacity(kShelfInkDropVisibleOpacity);
   }
   SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_ASH_SHELF_APP_LIST_LAUNCHER_TITLE));
   SetSize(
       gfx::Size(GetShelfConstant(SHELF_SIZE), GetShelfConstant(SHELF_SIZE)));
   SetFocusPainter(views::Painter::CreateSolidFocusPainter(
       kFocusBorderColor, gfx::Insets(1, 1, 1, 1)));
   set_notify_action(CustomButton::NOTIFY_ON_PRESS);
 }
 
 AppListButton::~AppListButton() {}
 
 void AppListButton::OnAppListShown() {
   if (ash::MaterialDesignController::IsShelfMaterial())
     AnimateInkDrop(views::InkDropState::ACTIVATED, nullptr);
   else
     SchedulePaint();
+  is_showing_app_list_ = true;
+  wm_shelf_->UpdateAutoHideState();
 }
 
 void AppListButton::OnAppListDismissed() {
   if (ash::MaterialDesignController::IsShelfMaterial())
     AnimateInkDrop(views::InkDropState::DEACTIVATED, nullptr);
   else
     SchedulePaint();
+  is_showing_app_list_ = false;
+  wm_shelf_->UpdateAutoHideState();
 }
 
 void AppListButton::SetBackgroundAlpha(int alpha) {
   background_alpha_ = alpha;
   SchedulePaint();
 }
 
 bool AppListButton::OnMousePressed(const ui::MouseEvent& event) {
   ImageButton::OnMousePressed(event);
   shelf_view_->PointerPressedOnButton(this, ShelfView::MOUSE, event);
@@ skipping 208 matching lines @@
   int center = std::max(width(), height()) / 2.f;
   gfx::Point centroid(center, center);
   // For the left shelf alignment, we need to right-justify. For other shelf
   // alignments, left/top justification (i.e. no adjustments are necessary).
   if (SHELF_ALIGNMENT_LEFT == wm_shelf_->GetAlignment())
     centroid.set_x(width() - center);
   return centroid;
 }
 
 }  // namespace ash