| Index: ui/base/touch/touch_editing_controller.h
|
| diff --git a/ui/base/touch/touch_editing_controller.h b/ui/base/touch/touch_editing_controller.h
|
| index e4f5205b4f6c9c8c9a94c2653cd1efcc538296d9..96eecc1c2a40f51c8884b5527303172e97269b8c 100644
|
| --- a/ui/base/touch/touch_editing_controller.h
|
| +++ b/ui/base/touch/touch_editing_controller.h
|
| @@ -54,7 +54,7 @@ class UI_BASE_EXPORT TouchEditable : public ui::SimpleMenuModel::Delegate {
|
| virtual void ConvertPointFromScreen(gfx::Point* point) = 0;
|
|
|
| // Returns true if the editable draws its own handles (hence, the
|
| - // TouchSelectionController need not draw handles).
|
| + // TouchEditingControllerDeprecated need not draw handles).
|
| virtual bool DrawsHandles() = 0;
|
|
|
| // Tells the editable to open context menu.
|
| @@ -70,12 +70,13 @@ class UI_BASE_EXPORT TouchEditable : public ui::SimpleMenuModel::Delegate {
|
|
|
| // This defines the callback interface for other code to be notified of changes
|
| // in the state of a TouchEditable.
|
| -class UI_BASE_EXPORT TouchSelectionController {
|
| +class UI_BASE_EXPORT TouchEditingControllerDeprecated {
|
| public:
|
| - virtual ~TouchSelectionController() {}
|
| + virtual ~TouchEditingControllerDeprecated() {}
|
|
|
| - // Creates a TouchSelectionController. Caller owns the returned object.
|
| - static TouchSelectionController* create(
|
| + // Creates a TouchEditingControllerDeprecated. Caller owns the returned
|
| + // object.
|
| + static TouchEditingControllerDeprecated* Create(
|
| TouchEditable* client_view);
|
|
|
| // Notifies the controller that the selection has changed.
|
| @@ -89,14 +90,15 @@ class UI_BASE_EXPORT TouchSelectionController {
|
| virtual void HideHandles(bool quick) = 0;
|
| };
|
|
|
| -class UI_BASE_EXPORT TouchSelectionControllerFactory {
|
| +class UI_BASE_EXPORT TouchEditingControllerFactory {
|
| public:
|
| - static void SetInstance(TouchSelectionControllerFactory* instance);
|
| + static void SetInstance(TouchEditingControllerFactory* instance);
|
|
|
| - virtual TouchSelectionController* create(TouchEditable* client_view) = 0;
|
| + virtual TouchEditingControllerDeprecated* Create(TouchEditable* client_view)
|
| + = 0;
|
|
|
| protected:
|
| - virtual ~TouchSelectionControllerFactory() {}
|
| + virtual ~TouchEditingControllerFactory() {}
|
| };
|
|
|
| } // namespace ui
|
|
|