[ash] Wrong LauncherItem state when overflow bubble is shown

ash/shelf/overflow_bubble.cc

 // Copyright 2013 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/shelf/overflow_bubble.h"
 
 #include <algorithm>
 
 #include "ash/launcher/launcher_types.h"
 #include "ash/launcher/launcher_view.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ui/aura/root_window.h"
+#include "ui/base/events/event.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace internal {
 
 namespace {
@@ skipping 72 matching lines @@
 void OverflowBubbleView::InitOverflowBubble(views::View* anchor,
                                             LauncherView* launcher_view) {
   // set_anchor_view needs to be called before GetShelfLayoutManagerForLauncher
   // can be called.
   set_anchor_view(anchor);
   set_arrow(GetBubbleArrow());
   set_background(NULL);
   set_color(SkColorSetARGB(kLauncherBackgroundAlpha, 0, 0, 0));
   set_margins(gfx::Insets(kPadding, kPadding, kPadding, kPadding));
   set_move_with_anchor(true);
+  // Overflow bubble should not get focus. If it get focus when it is shown,
+  // active state item is changed to running state.
+  set_use_focusless(true);
 
   // Makes bubble view has a layer and clip its children layers.
   SetPaintToLayer(true);
   SetFillsBoundsOpaquely(false);
   layer()->SetMasksToBounds(true);
 
   launcher_view_ = launcher_view;
   AddChildView(launcher_view_);
 
   views::BubbleDelegateView::CreateBubble(this);
@@ skipping 116 matching lines @@
   }
 
   GetBubbleFrameView()->SchedulePaint();
   return bubble_rect;
 }
 
 }  // namespace
 
 OverflowBubble::OverflowBubble()
     : bubble_(NULL),
+      anchor_(NULL),
       launcher_view_(NULL) {
 }
 
 OverflowBubble::~OverflowBubble() {
   Hide();
 }
 
 void OverflowBubble::Show(views::View* anchor, LauncherView* launcher_view) {
   Hide();
 
   OverflowBubbleView* bubble_view = new OverflowBubbleView();
   bubble_view->InitOverflowBubble(anchor, launcher_view);
   launcher_view_ = launcher_view;
+  anchor_ = anchor;
+
+  Shell::GetInstance()->AddPreTargetHandler(this);
 
   bubble_ = bubble_view;
   RootWindowController::ForWindow(anchor->GetWidget()->GetNativeView())->
       GetSystemTray()->InitializeBubbleAnimations(bubble_->GetWidget());
   bubble_->GetWidget()->AddObserver(this);
   bubble_->GetWidget()->Show();
 }
 
 void OverflowBubble::Hide() {
   if (!IsShowing())
     return;
 
+  Shell::GetInstance()->RemovePreTargetHandler(this);
   bubble_->GetWidget()->RemoveObserver(this);
   bubble_->GetWidget()->Close();
   bubble_ = NULL;
+  anchor_ = NULL;
   launcher_view_ = NULL;
 }
 
+void OverflowBubble::OnMouseEvent(ui::MouseEvent* event) {
+  if (event->type() == ui::ET_MOUSE_PRESSED &&
+      !bubble_->GetBoundsInScreen().Contains(event->root_location()) &&
+      !anchor_->GetBoundsInScreen().Contains(event->root_location())) {
+    Hide();
+  }
+}
+
+void OverflowBubble::OnTouchEvent(ui::TouchEvent* event) {
+  if (event->type() == ui::ET_TOUCH_PRESSED &&
+      !bubble_->GetBoundsInScreen().Contains(event->root_location()) &&
+      !anchor_->GetBoundsInScreen().Contains(event->root_location())) {
+    Hide();
+  }
+}
+
 void OverflowBubble::OnWidgetDestroying(views::Widget* widget) {
   DCHECK(widget == bubble_->GetWidget());
   bubble_ = NULL;
+  anchor_ = NULL;
   launcher_view_ = NULL;
   ShelfLayoutManager::ForLauncher(
       widget->GetNativeView())->shelf_widget()->launcher()->SchedulePaint();
 }
 
 }  // namespace internal
 }  // namespace ash