| 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 "base/utf_string_conversions.h" | 5 #include "base/utf_string_conversions.h" |
| 6 #include "ui/base/accelerators/accelerator.h" |
| 6 #include "ui/base/keycodes/keyboard_codes.h" | 7 #include "ui/base/keycodes/keyboard_codes.h" |
| 7 #include "ui/base/models/accelerator.h" | |
| 8 #include "ui/views/focus/accelerator_handler.h" | 8 #include "ui/views/focus/accelerator_handler.h" |
| 9 #include "ui/views/focus/focus_manager_factory.h" | 9 #include "ui/views/focus/focus_manager_factory.h" |
| 10 #include "ui/views/focus/focus_manager_test.h" | 10 #include "ui/views/focus/focus_manager_test.h" |
| 11 #include "ui/views/widget/widget.h" | 11 #include "ui/views/widget/widget.h" |
| 12 #include "views/controls/button/text_button.h" | 12 #include "views/controls/button/text_button.h" |
| 13 #include "views/controls/textfield/textfield.h" | 13 #include "views/controls/textfield/textfield.h" |
| 14 | 14 |
| 15 #if !defined(USE_AURA) | 15 #if !defined(USE_AURA) |
| 16 #include "views/controls/tabbed_pane/native_tabbed_pane_wrapper.h" |
| 16 #include "views/controls/tabbed_pane/tabbed_pane.h" | 17 #include "views/controls/tabbed_pane/tabbed_pane.h" |
| 17 #include "views/controls/tabbed_pane/native_tabbed_pane_wrapper.h" | |
| 18 #endif | 18 #endif |
| 19 | 19 |
| 20 #if defined(OS_LINUX) | 20 #if defined(OS_LINUX) |
| 21 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h" | 21 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h" |
| 22 #endif | 22 #endif |
| 23 | 23 |
| 24 namespace views { | 24 namespace views { |
| 25 | 25 |
| 26 enum FocusTestEventType { | 26 enum FocusTestEventType { |
| 27 ON_FOCUS = 0, | 27 ON_FOCUS = 0, |
| (...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 456 | 456 |
| 457 // Test window, button and focus manager should all be destructed. | 457 // Test window, button and focus manager should all be destructed. |
| 458 ASSERT_EQ(3, static_cast<int>(dtor_tracker_.size())); | 458 ASSERT_EQ(3, static_cast<int>(dtor_tracker_.size())); |
| 459 | 459 |
| 460 // Focus manager should be the last one to destruct. | 460 // Focus manager should be the last one to destruct. |
| 461 ASSERT_STREQ("FocusManagerDtorTracked", dtor_tracker_[2].c_str()); | 461 ASSERT_STREQ("FocusManagerDtorTracked", dtor_tracker_[2].c_str()); |
| 462 } | 462 } |
| 463 #endif | 463 #endif |
| 464 | 464 |
| 465 } // namespace views | 465 } // namespace views |
| OLD | NEW |