| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #ifndef UI_VIEWS_VIEWS_DELEGATE_H_ | 5 #ifndef UI_VIEWS_VIEWS_DELEGATE_H_ |
| 6 #define UI_VIEWS_VIEWS_DELEGATE_H_ | 6 #define UI_VIEWS_VIEWS_DELEGATE_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #if defined(OS_WIN) | 10 #if defined(OS_WIN) |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 190 const base::Closure& callback); | 190 const base::Closure& callback); |
| 191 #endif | 191 #endif |
| 192 | 192 |
| 193 // Returns a blocking pool task runner given a TaskRunnerType. | 193 // Returns a blocking pool task runner given a TaskRunnerType. |
| 194 virtual scoped_refptr<base::TaskRunner> GetBlockingPoolTaskRunner(); | 194 virtual scoped_refptr<base::TaskRunner> GetBlockingPoolTaskRunner(); |
| 195 | 195 |
| 196 protected: | 196 protected: |
| 197 ViewsDelegate(); | 197 ViewsDelegate(); |
| 198 | 198 |
| 199 private: | 199 private: |
| 200 scoped_ptr<ViewsTouchEditingControllerFactory> views_tsc_factory_; | 200 std::unique_ptr<ViewsTouchEditingControllerFactory> views_tsc_factory_; |
| 201 | 201 |
| 202 #if defined(USE_AURA) | 202 #if defined(USE_AURA) |
| 203 scoped_ptr<TouchSelectionMenuRunnerViews> touch_selection_menu_runner_; | 203 std::unique_ptr<TouchSelectionMenuRunnerViews> touch_selection_menu_runner_; |
| 204 #endif | 204 #endif |
| 205 | 205 |
| 206 NativeWidgetFactory native_widget_factory_; | 206 NativeWidgetFactory native_widget_factory_; |
| 207 | 207 |
| 208 DISALLOW_COPY_AND_ASSIGN(ViewsDelegate); | 208 DISALLOW_COPY_AND_ASSIGN(ViewsDelegate); |
| 209 }; | 209 }; |
| 210 | 210 |
| 211 } // namespace views | 211 } // namespace views |
| 212 | 212 |
| 213 #endif // UI_VIEWS_VIEWS_DELEGATE_H_ | 213 #endif // UI_VIEWS_VIEWS_DELEGATE_H_ |
| OLD | NEW |