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 "ui/views/touchui/touch_selection_menu_runner_views.h" |
7 #include "ui/views/views_touch_selection_controller_factory.h" | 8 #include "ui/views/views_touch_selection_controller_factory.h" |
8 | 9 |
9 namespace views { | 10 namespace views { |
10 | 11 |
11 ViewsDelegate::ViewsDelegate() | 12 ViewsDelegate::ViewsDelegate() |
12 : views_tsc_factory_(new ViewsTouchEditingControllerFactory) { | 13 : touch_selection_menu_runner_(new TouchSelectionMenuRunnerViews()), |
| 14 views_tsc_factory_(new ViewsTouchEditingControllerFactory) { |
13 ui::TouchEditingControllerFactory::SetInstance(views_tsc_factory_.get()); | 15 ui::TouchEditingControllerFactory::SetInstance(views_tsc_factory_.get()); |
14 } | 16 } |
15 | 17 |
16 ViewsDelegate::~ViewsDelegate() { | 18 ViewsDelegate::~ViewsDelegate() { |
17 ui::TouchEditingControllerFactory::SetInstance(NULL); | 19 ui::TouchEditingControllerFactory::SetInstance(NULL); |
18 } | 20 } |
19 | 21 |
20 void ViewsDelegate::SaveWindowPlacement(const Widget* widget, | 22 void ViewsDelegate::SaveWindowPlacement(const Widget* widget, |
21 const std::string& window_name, | 23 const std::string& window_name, |
22 const gfx::Rect& bounds, | 24 const gfx::Rect& bounds, |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
86 } | 88 } |
87 | 89 |
88 #if defined(OS_WIN) | 90 #if defined(OS_WIN) |
89 int ViewsDelegate::GetAppbarAutohideEdges(HMONITOR monitor, | 91 int ViewsDelegate::GetAppbarAutohideEdges(HMONITOR monitor, |
90 const base::Closure& callback) { | 92 const base::Closure& callback) { |
91 return EDGE_BOTTOM; | 93 return EDGE_BOTTOM; |
92 } | 94 } |
93 #endif | 95 #endif |
94 | 96 |
95 } // namespace views | 97 } // namespace views |
OLD | NEW |