Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(140)

Unified Diff: ui/views/touchui/touch_selection_controller_impl.h

Issue 551883002: Deactivate touch selection on transform (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Used the new propagated transformed event Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/views/touchui/touch_selection_controller_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/touchui/touch_selection_controller_impl.h
diff --git a/ui/views/touchui/touch_selection_controller_impl.h b/ui/views/touchui/touch_selection_controller_impl.h
index 04076af2e8fc5688e0aba5f92dedf94d6eb64e7f..353c94900aca98eb2f7909e8e12a6a4630cf66a4 100644
--- a/ui/views/touchui/touch_selection_controller_impl.h
+++ b/ui/views/touchui/touch_selection_controller_impl.h
@@ -6,6 +6,7 @@
#define UI_UI_VIEWS_TOUCHUI_TOUCH_SELECTION_CONTROLLER_IMPL_H_
#include "base/timer/timer.h"
+#include "ui/aura/window_observer.h"
#include "ui/base/touch/touch_editing_controller.h"
#include "ui/gfx/point.h"
#include "ui/views/touchui/touch_editing_menu.h"
@@ -23,6 +24,7 @@ class WidgetTestInteractive;
class VIEWS_EXPORT TouchSelectionControllerImpl
: public ui::TouchSelectionController,
public TouchEditingMenuController,
+ public aura::WindowObserver,
public WidgetObserver,
public ui::EventHandler {
public:
@@ -68,6 +70,10 @@ class VIEWS_EXPORT TouchSelectionControllerImpl
virtual void OpenContextMenu() OVERRIDE;
virtual void OnMenuClosed(TouchEditingMenuView* menu) OVERRIDE;
+ // Overriden from aura::WindowObserver.
+ virtual void OnAncestorWindowTransformed(aura::Window* source,
+ aura::Window* window) OVERRIDE;
+
// Overridden from WidgetObserver. We will observe the widget backing the
// |client_view_| so that when its moved/resized, we can update the selection
// handles appropriately.
« no previous file with comments | « no previous file | ui/views/touchui/touch_selection_controller_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698