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

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

Issue 12224133: Move touch_selection_controller interface to ui/base. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: patch Created 7 years, 10 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 | « ui/views/touchui/touch_selection_controller.cc ('k') | 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 08a0c0af840be37620f7a98a30550d951a6321cc..5d042e739b131c201efdd7dd17b1ff4d796e03be 100644
--- a/ui/views/touchui/touch_selection_controller_impl.h
+++ b/ui/views/touchui/touch_selection_controller_impl.h
@@ -6,8 +6,8 @@
#define UI_UI_VIEWS_TOUCHUI_TOUCH_SELECTION_CONTROLLER_IMPL_H_
#include "base/timer.h"
+#include "ui/base/touch/touch_editing_controller.h"
#include "ui/gfx/point.h"
-#include "ui/views/touchui/touch_selection_controller.h"
#include "ui/views/view.h"
#include "ui/views/views_export.h"
@@ -16,10 +16,11 @@ namespace views {
// Touch specific implementation of TouchSelectionController. Responsible for
// displaying selection handles and menu elements relevant in a touch interface.
class VIEWS_EXPORT TouchSelectionControllerImpl
- : public TouchSelectionController {
+ : public ui::TouchSelectionController {
public:
// Use TextSelectionController::create().
- explicit TouchSelectionControllerImpl(TouchSelectionClientView* client_view);
+ explicit TouchSelectionControllerImpl(
+ ui::TouchEditable* client_view);
virtual ~TouchSelectionControllerImpl();
@@ -63,7 +64,7 @@ class VIEWS_EXPORT TouchSelectionControllerImpl
bool IsSelectionHandle1Visible();
bool IsSelectionHandle2Visible();
- TouchSelectionClientView* client_view_;
+ ui::TouchEditable* client_view_;
scoped_ptr<SelectionHandleView> selection_handle_1_;
scoped_ptr<SelectionHandleView> selection_handle_2_;
scoped_ptr<TouchContextMenuView> context_menu_;
« no previous file with comments | « ui/views/touchui/touch_selection_controller.cc ('k') | ui/views/touchui/touch_selection_controller_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698