| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/views/views_delegate.h" | 5 #include "ui/views/views_delegate.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "build/build_config.h" |
| 8 #include "ui/views/views_touch_selection_controller_factory.h" | 9 #include "ui/views/views_touch_selection_controller_factory.h" |
| 9 #include "ui/views/widget/native_widget_private.h" | 10 #include "ui/views/widget/native_widget_private.h" |
| 10 | 11 |
| 11 #if defined(USE_AURA) | 12 #if defined(USE_AURA) |
| 12 #include "ui/views/touchui/touch_selection_menu_runner_views.h" | 13 #include "ui/views/touchui/touch_selection_menu_runner_views.h" |
| 13 #endif | 14 #endif |
| 14 | 15 |
| 15 namespace views { | 16 namespace views { |
| 16 namespace { | 17 namespace { |
| 17 | 18 |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 views_delegate = this; | 127 views_delegate = this; |
| 127 | 128 |
| 128 ui::TouchEditingControllerFactory::SetInstance(views_tsc_factory_.get()); | 129 ui::TouchEditingControllerFactory::SetInstance(views_tsc_factory_.get()); |
| 129 | 130 |
| 130 #if defined(USE_AURA) | 131 #if defined(USE_AURA) |
| 131 touch_selection_menu_runner_.reset(new TouchSelectionMenuRunnerViews()); | 132 touch_selection_menu_runner_.reset(new TouchSelectionMenuRunnerViews()); |
| 132 #endif | 133 #endif |
| 133 } | 134 } |
| 134 | 135 |
| 135 } // namespace views | 136 } // namespace views |
| OLD | NEW |