| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "views/controls/menu/nested_dispatcher_gtk.h" | 5 #include "views/controls/menu/nested_dispatcher_gtk.h" |
| 6 | 6 |
| 7 #if defined(TOUCH_UI) | 7 #if defined(TOUCH_UI) |
| 8 #include "views/focus/accelerator_handler.h" | 8 #include "ui/views/focus/accelerator_handler.h" |
| 9 #endif | 9 #endif |
| 10 | 10 |
| 11 namespace views { | 11 namespace views { |
| 12 | 12 |
| 13 NestedDispatcherGtk::NestedDispatcherGtk(MessageLoopForUI::Dispatcher* creator, | 13 NestedDispatcherGtk::NestedDispatcherGtk(MessageLoopForUI::Dispatcher* creator, |
| 14 bool allow_nested_task) | 14 bool allow_nested_task) |
| 15 : creator_(creator), | 15 : creator_(creator), |
| 16 allow_nested_task_(allow_nested_task) { | 16 allow_nested_task_(allow_nested_task) { |
| 17 } | 17 } |
| 18 | 18 |
| (...skipping 18 matching lines...) Expand all Loading... |
| 37 NestedDispatcherGtk::Dispatch(XEvent* xevent) { | 37 NestedDispatcherGtk::Dispatch(XEvent* xevent) { |
| 38 return creator_->Dispatch(xevent); | 38 return creator_->Dispatch(xevent); |
| 39 } | 39 } |
| 40 #else | 40 #else |
| 41 bool NestedDispatcherGtk::Dispatch(GdkEvent* event) { | 41 bool NestedDispatcherGtk::Dispatch(GdkEvent* event) { |
| 42 return creator_ && creator_->Dispatch(event); | 42 return creator_ && creator_->Dispatch(event); |
| 43 } | 43 } |
| 44 #endif // defined(TOUCH_UI) | 44 #endif // defined(TOUCH_UI) |
| 45 | 45 |
| 46 } // namespace views | 46 } // namespace views |
| OLD | NEW |