| Index: ui/base/touch/touch_editing_controller.cc
|
| diff --git a/ui/base/touch/touch_editing_controller.cc b/ui/base/touch/touch_editing_controller.cc
|
| index 1b84ed929bf2af8ad365bd6974d87ec7e3866bb7..79a70ec63a20b4fa499dd077ef0259010aeb84da 100644
|
| --- a/ui/base/touch/touch_editing_controller.cc
|
| +++ b/ui/base/touch/touch_editing_controller.cc
|
| @@ -7,19 +7,19 @@
|
| namespace ui {
|
|
|
| namespace {
|
| -TouchSelectionControllerFactory* g_shared_instance = NULL;
|
| +TouchEditingControllerFactory* g_shared_instance = NULL;
|
| } // namespace
|
|
|
| -TouchSelectionController* TouchSelectionController::create(
|
| +TouchEditingControllerDeprecated* TouchEditingControllerDeprecated::Create(
|
| TouchEditable* client_view) {
|
| if (g_shared_instance)
|
| - return g_shared_instance->create(client_view);
|
| + return g_shared_instance->Create(client_view);
|
| return NULL;
|
| }
|
|
|
| // static
|
| -void TouchSelectionControllerFactory::SetInstance(
|
| - TouchSelectionControllerFactory* instance) {
|
| +void TouchEditingControllerFactory::SetInstance(
|
| + TouchEditingControllerFactory* instance) {
|
| g_shared_instance = instance;
|
| }
|
|
|
|
|