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 <string> | 5 #include <string> |
6 #include <vector> | 6 #include <vector> |
7 | 7 |
8 #include "base/auto_reset.h" | 8 #include "base/auto_reset.h" |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
(...skipping 13 matching lines...) Expand all Loading... |
24 #include "ui/gfx/render_text.h" | 24 #include "ui/gfx/render_text.h" |
25 #include "ui/views/controls/textfield/native_textfield_views.h" | 25 #include "ui/views/controls/textfield/native_textfield_views.h" |
26 #include "ui/views/controls/textfield/textfield.h" | 26 #include "ui/views/controls/textfield/textfield.h" |
27 #include "ui/views/controls/textfield/textfield_controller.h" | 27 #include "ui/views/controls/textfield/textfield_controller.h" |
28 #include "ui/views/controls/textfield/textfield_views_model.h" | 28 #include "ui/views/controls/textfield/textfield_views_model.h" |
29 #include "ui/views/events/event.h" | 29 #include "ui/views/events/event.h" |
30 #include "ui/views/focus/focus_manager.h" | 30 #include "ui/views/focus/focus_manager.h" |
31 #include "ui/views/ime/mock_input_method.h" | 31 #include "ui/views/ime/mock_input_method.h" |
32 #include "ui/views/test/test_views_delegate.h" | 32 #include "ui/views/test/test_views_delegate.h" |
33 #include "ui/views/test/views_test_base.h" | 33 #include "ui/views/test/views_test_base.h" |
| 34 #include "ui/views/views_delegate.h" |
34 #include "ui/views/widget/native_widget_private.h" | 35 #include "ui/views/widget/native_widget_private.h" |
35 #include "ui/views/widget/widget.h" | 36 #include "ui/views/widget/widget.h" |
36 #include "views/views_delegate.h" | |
37 | 37 |
38 // Drag and drop for aura in linux hasn't been implemented yet. | 38 // Drag and drop for aura in linux hasn't been implemented yet. |
39 // Bug http://crbug.com/97845 | 39 // Bug http://crbug.com/97845 |
40 #if defined(USE_AURA) && defined(OS_LINUX) | 40 #if defined(USE_AURA) && defined(OS_LINUX) |
41 #define MAYBE_DragAndDrop_InitiateDrag DISABLED_DragAndDrop_InitiateDrag | 41 #define MAYBE_DragAndDrop_InitiateDrag DISABLED_DragAndDrop_InitiateDrag |
42 #define MAYBE_DragAndDrop_ToTheLeft DISABLED_DragAndDrop_ToTheLeft | 42 #define MAYBE_DragAndDrop_ToTheLeft DISABLED_DragAndDrop_ToTheLeft |
43 #define MAYBE_DragAndDrop_ToTheRight DISABLED_DragAndDrop_ToTheRight | 43 #define MAYBE_DragAndDrop_ToTheRight DISABLED_DragAndDrop_ToTheRight |
44 #define MAYBE_DragAndDrop_Canceled DISABLED_DragAndDrop_Canceled | 44 #define MAYBE_DragAndDrop_Canceled DISABLED_DragAndDrop_Canceled |
45 #else | 45 #else |
46 #define MAYBE_DragAndDrop_InitiateDrag DragAndDrop_InitiateDrag | 46 #define MAYBE_DragAndDrop_InitiateDrag DragAndDrop_InitiateDrag |
(...skipping 1518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1565 #else | 1565 #else |
1566 EXPECT_EQ(500U, textfield_->GetCursorPosition()); | 1566 EXPECT_EQ(500U, textfield_->GetCursorPosition()); |
1567 #endif | 1567 #endif |
1568 #endif // !defined(OS_WIN) | 1568 #endif // !defined(OS_WIN) |
1569 | 1569 |
1570 // Reset locale. | 1570 // Reset locale. |
1571 base::i18n::SetICUDefaultLocale(locale); | 1571 base::i18n::SetICUDefaultLocale(locale); |
1572 } | 1572 } |
1573 | 1573 |
1574 } // namespace views | 1574 } // namespace views |
OLD | NEW |