Changes how we detect whether the launcher should be shown when

ash/launcher/launcher.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/launcher/launcher.h"
 
 #include "ash/focus_cycler.h"
 #include "ash/launcher/launcher_delegate.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_view.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/shelf_layout_manager.h"
-#include "base/timer.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/accessible_pane_view.h"
 #include "ui/views/background.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace ash {
 
 namespace {
 
-// Delay before showing the launcher after the mouse enters the view.
-const int kShowDelayMS = 300;
-
 // Max alpha of the background.
 const int kBackgroundAlpha = 128;
 
 }
 
 // The contents view of the Widget. This view contains LauncherView and
 // sizes it to the width of the widget minus the size of the status area.
 class Launcher::DelegateView : public views::WidgetDelegate,
                                public views::AccessiblePaneView{
  public:
   explicit DelegateView(Launcher* launcher);
   virtual ~DelegateView();
 
   void SetStatusWidth(int width);
   int status_width() const { return status_width_; }
 
   void set_focus_cycler(const internal::FocusCycler* focus_cycler) {
     focus_cycler_ = focus_cycler;
   }
 
   // views::View overrides
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void Layout() OVERRIDE;
-  virtual void OnMouseEntered(const views::MouseEvent& event) OVERRIDE;
-  virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE;
 
   // views::WidgetDelegateView overrides:
   virtual views::Widget* GetWidget() OVERRIDE {
     return View::GetWidget();
   }
   virtual const views::Widget* GetWidget() const OVERRIDE {
     return View::GetWidget();
   }
   virtual bool CanActivate() const OVERRIDE {
     // We don't want mouse clicks to activate us, but we need to allow
     // activation when the user is using the keyboard (FocusCycler).
     return focus_cycler_ && focus_cycler_->widget_activating() == GetWidget();
   }
 
  private:
-  // Shows the launcher.
-  void ShowLauncher();
-
   Launcher* launcher_;
 
   // Width of the status area.
   int status_width_;
 
   const internal::FocusCycler* focus_cycler_;
 
-  base::OneShotTimer<DelegateView> show_timer_;
-
   DISALLOW_COPY_AND_ASSIGN(DelegateView);
 };
 
 Launcher::DelegateView::DelegateView(Launcher* launcher)
     : launcher_(launcher),
       status_width_(0),
       focus_cycler_(NULL) {
-  set_notify_enter_exit_on_child(true);
 }
 
 Launcher::DelegateView::~DelegateView() {
 }
 
 void Launcher::DelegateView::SetStatusWidth(int width) {
   if (status_width_ == width)
     return;
 
   status_width_ = width;
   Layout();
 }
 
 gfx::Size Launcher::DelegateView::GetPreferredSize() {
   return child_count() > 0 ? child_at(0)->GetPreferredSize() : gfx::Size();
 }
 
 void Launcher::DelegateView::Layout() {
   if (child_count() == 0)
     return;
   child_at(0)->SetBounds(0, 0, std::max(0, width() - status_width_), height());
 }
 
-void Launcher::DelegateView::OnMouseEntered(const views::MouseEvent& event) {
-  if (!show_timer_.IsRunning()) {
-    // The user may be trying to target a button near the bottom of the screen
-    // and accidentally moved into the launcher area. Delay showing.
-    show_timer_.Start(FROM_HERE,
-                      base::TimeDelta::FromMilliseconds(kShowDelayMS),
-                      this, &DelegateView::ShowLauncher);
-  }
-}
-
-void Launcher::DelegateView::OnMouseExited(const views::MouseEvent& event) {
-  show_timer_.Stop();
-  internal::ShelfLayoutManager* shelf = Shell::GetInstance()->shelf();
-  shelf->SetState(shelf->visibility_state(),
-                  internal::ShelfLayoutManager::AUTO_HIDE_HIDDEN);
-}
-
-void Launcher::DelegateView::ShowLauncher() {
-  show_timer_.Stop();
-  internal::ShelfLayoutManager* shelf = Shell::GetInstance()->shelf();
-  shelf->SetState(shelf->visibility_state(),
-                  internal::ShelfLayoutManager::AUTO_HIDE_SHOWN);
-}
-
-
 // Launcher --------------------------------------------------------------------
 
 Launcher::Launcher(aura::Window* window_container)
     : widget_(NULL),
       window_container_(window_container),
       delegate_view_(NULL),
       launcher_view_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           background_animator_(this, 0, kBackgroundAlpha)) {
   model_.reset(new LauncherModel);
@@ skipping 75 matching lines @@
   if (alpha == 0) {
     delegate_view_->set_background(NULL);
   } else {
     delegate_view_->set_background(
         views::Background::CreateSolidBackground(0, 0, 0, alpha));
   }
   delegate_view_->SchedulePaint();
 }
 
 }  // namespace ash