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 "ui/views/views_touch_selection_controller_factory.h" | 8 #include "ui/views/views_touch_selection_controller_factory.h" |
9 | 9 |
10 #if defined(USE_AURA) | 10 #if defined(USE_AURA) |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
47 ui::AXEvent event_type) { | 47 ui::AXEvent event_type) { |
48 } | 48 } |
49 | 49 |
50 void ViewsDelegate::NotifyMenuItemFocused(const base::string16& menu_name, | 50 void ViewsDelegate::NotifyMenuItemFocused(const base::string16& menu_name, |
51 const base::string16& menu_item_name, | 51 const base::string16& menu_item_name, |
52 int item_index, | 52 int item_index, |
53 int item_count, | 53 int item_count, |
54 bool has_submenu) { | 54 bool has_submenu) { |
55 } | 55 } |
56 | 56 |
| 57 ViewsDelegate::ProcessMenuAcceleratorResult |
| 58 ViewsDelegate::ProcessAcceleratorWhileMenuShowing( |
| 59 const ui::Accelerator& accelerator) { |
| 60 return ACCELERATOR_HANDLED; |
| 61 } |
| 62 |
57 #if defined(OS_WIN) | 63 #if defined(OS_WIN) |
58 HICON ViewsDelegate::GetDefaultWindowIcon() const { | 64 HICON ViewsDelegate::GetDefaultWindowIcon() const { |
59 return nullptr; | 65 return nullptr; |
60 } | 66 } |
61 | 67 |
62 bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const { | 68 bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const { |
63 return false; | 69 return false; |
64 } | 70 } |
65 #elif defined(OS_LINUX) && !defined(OS_CHROMEOS) | 71 #elif defined(OS_LINUX) && !defined(OS_CHROMEOS) |
66 gfx::ImageSkia* ViewsDelegate::GetDefaultWindowIcon() const { | 72 gfx::ImageSkia* ViewsDelegate::GetDefaultWindowIcon() const { |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 views_delegate = this; | 125 views_delegate = this; |
120 | 126 |
121 ui::TouchEditingControllerFactory::SetInstance(views_tsc_factory_.get()); | 127 ui::TouchEditingControllerFactory::SetInstance(views_tsc_factory_.get()); |
122 | 128 |
123 #if defined(USE_AURA) | 129 #if defined(USE_AURA) |
124 touch_selection_menu_runner_.reset(new TouchSelectionMenuRunnerViews()); | 130 touch_selection_menu_runner_.reset(new TouchSelectionMenuRunnerViews()); |
125 #endif | 131 #endif |
126 } | 132 } |
127 | 133 |
128 } // namespace views | 134 } // namespace views |
OLD | NEW |