| 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/accessible_pane_view.h" | 5 #include "views/accessible_pane_view.h" |
| 6 | 6 |
| 7 #include "ui/base/models/accelerator.h" | 7 #include "ui/base/models/accelerator.h" |
| 8 #include "ui/views/layout/fill_layout.h" |
| 8 #include "ui/views/test/views_test_base.h" | 9 #include "ui/views/test/views_test_base.h" |
| 9 #include "views/controls/button/text_button.h" | 10 #include "views/controls/button/text_button.h" |
| 10 #include "views/layout/fill_layout.h" | |
| 11 #include "views/widget/widget.h" | 11 #include "views/widget/widget.h" |
| 12 | 12 |
| 13 namespace views { | 13 namespace views { |
| 14 | 14 |
| 15 // TODO(alicet): bring pane rotation into views and add tests. | 15 // TODO(alicet): bring pane rotation into views and add tests. |
| 16 // See browser_view.cc for details. | 16 // See browser_view.cc for details. |
| 17 | 17 |
| 18 typedef ViewsTestBase AccessiblePaneViewTest; | 18 typedef ViewsTestBase AccessiblePaneViewTest; |
| 19 | 19 |
| 20 class TestBarView : public AccessiblePaneView, | 20 class TestBarView : public AccessiblePaneView, |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 169 test_view->GetWidget()->GetFocusManager()->GetFocusedView()); | 169 test_view->GetWidget()->GetFocusManager()->GetFocusedView()); |
| 170 | 170 |
| 171 // ESC | 171 // ESC |
| 172 test_view->AcceleratorPressed(test_view->escape_key()); | 172 test_view->AcceleratorPressed(test_view->escape_key()); |
| 173 EXPECT_EQ(original_test_view->third_child_button(), | 173 EXPECT_EQ(original_test_view->third_child_button(), |
| 174 test_view->GetWidget()->GetFocusManager()->GetFocusedView()); | 174 test_view->GetWidget()->GetFocusManager()->GetFocusedView()); |
| 175 widget->CloseNow(); | 175 widget->CloseNow(); |
| 176 widget.reset(); | 176 widget.reset(); |
| 177 } | 177 } |
| 178 } // namespace views | 178 } // namespace views |
| OLD | NEW |