Add pretargethandler to exit overview mode on touch/click.

ash/desktop_background/desktop_background_view.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/desktop_background/desktop_background_view.h"
 
 #include <limits>
 
 #include "ash/ash_export.h"
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/desktop_background_widget_controller.h"
 #include "ash/desktop_background/user_wallpaper_delegate.h"
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
+#include "ash/wm/overview/window_selector_controller.h"
 #include "ash/wm/window_animations.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/size_conversions.h"
 #include "ui/gfx/transform.h"
@@ skipping 37 matching lines @@
     transform.Scale(ui_scale, ui_scale);
     child->SetTransform(transform);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(LayerControlView);
 };
 
 }  // namespace
 
+namespace internal {

[tdanderson, 2014/08/01 19:32:14]

newline after line 76

[rsadam, 2014/08/01 19:57:10]

Done.

+// This event handler receives events in the pre-target phase and takes care of
+// the following:
+//   - Disabling overview mode on touch release.
+//   - Disabling overview mode on mouse release.
+class PreEventDispatchHandler : public ui::EventHandler {
+ public:
+  PreEventDispatchHandler() {}
+  virtual ~PreEventDispatchHandler() {}
+
+ private:
+  // ui::EventHandler:
+  virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE {

[tdanderson, 2014/08/01 19:32:14]

I'd add a CHECK_EQ to verify that the phase is actually EP_PRETARGET (here and
also at the top of the other method).

[rsadam, 2014/08/01 19:57:10]

Done.

+    WindowSelectorController* controller =
+        Shell::GetInstance()->window_selector_controller();
+    if (event->type() == ui::ET_MOUSE_RELEASED && controller->IsSelecting()) {

[tdanderson, 2014/08/01 19:32:14]

Since conditional is only one line, omit {} around the body.

[rsadam, 2014/08/01 19:57:10]

Acknowledged! Readded the braces since I moved the stopPropagation in here.

+      controller->ToggleOverview();
+    }

[tdanderson, 2014/08/01 19:32:14]

Mark the event as handled (here and also in the other method).

[rsadam, 2014/08/01 19:57:09]

Based on my understanding we should only do this if we use the event, so it
should be within the conditional, right?

[tdanderson, 2014/08/01 20:09:27]

Yep, that's correct.

+  }
+
+  virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE {

[tdanderson, 2014/08/01 19:32:14]

We should instead listen for ET_GESTURE_TAP instead of raw touch events.

[rsadam, 2014/08/01 19:57:09]

Done.

+    WindowSelectorController* controller =
+        Shell::GetInstance()->window_selector_controller();
+    if (event->type() == ui::ET_TOUCH_RELEASED && controller->IsSelecting()) {

[tdanderson, 2014/08/01 19:32:14]

Same as above, no {}

[rsadam, 2014/08/01 19:57:10]

Acknowledged.

+      controller->ToggleOverview();
+    }
+  }
+
+  DISALLOW_COPY_AND_ASSIGN(PreEventDispatchHandler);
+};

[tdanderson, 2014/08/01 19:32:14]

newline after line 105

[rsadam, 2014/08/01 19:57:10]

Done.

+}  // namespace internal
+
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopBackgroundView, public:
 
-DesktopBackgroundView::DesktopBackgroundView() {
+DesktopBackgroundView::DesktopBackgroundView()
+    : pre_dispatch_handler_(new internal::PreEventDispatchHandler()) {
   set_context_menu_controller(this);
+  AddPreTargetHandler(pre_dispatch_handler_.get());
 }
 
 DesktopBackgroundView::~DesktopBackgroundView() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopBackgroundView, views::View overrides:
 
 void DesktopBackgroundView::OnPaint(gfx::Canvas* canvas) {
   // Scale the image while maintaining the aspect ratio, cropping as
@@ skipping 127 matching lines @@
     // Disable animation if transition to login screen from an empty background.
     wm::SetWindowVisibilityAnimationTransition(
         desktop_widget->GetNativeView(), wm::ANIMATE_NONE);
   }
 
   desktop_widget->SetBounds(params.parent->bounds());
   return desktop_widget;
 }
 
 }  // namespace ash