| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/basictypes.h" | 5 #include "base/macros.h" |
| 6 #include "base/strings/utf_string_conversions.h" | 6 #include "base/strings/utf_string_conversions.h" |
| 7 #include "build/build_config.h" |
| 7 #include "ui/base/ui_base_types.h" | 8 #include "ui/base/ui_base_types.h" |
| 8 #include "ui/views/controls/button/label_button.h" | 9 #include "ui/views/controls/button/label_button.h" |
| 9 #include "ui/views/test/test_views.h" | 10 #include "ui/views/test/test_views.h" |
| 10 #include "ui/views/test/views_test_base.h" | 11 #include "ui/views/test/views_test_base.h" |
| 11 #include "ui/views/widget/widget.h" | 12 #include "ui/views/widget/widget.h" |
| 12 #include "ui/views/window/dialog_client_view.h" | 13 #include "ui/views/window/dialog_client_view.h" |
| 13 #include "ui/views/window/dialog_delegate.h" | 14 #include "ui/views/window/dialog_delegate.h" |
| 14 | 15 |
| 15 namespace views { | 16 namespace views { |
| 16 | 17 |
| (...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 309 // Test that the FocusManager is properly cleared when the DialogClientView is | 310 // Test that the FocusManager is properly cleared when the DialogClientView is |
| 310 // removed from |dialog| during the widget's destruction. | 311 // removed from |dialog| during the widget's destruction. |
| 311 client_view->set_owned_by_client(); | 312 client_view->set_owned_by_client(); |
| 312 scoped_ptr<DialogClientView> owned_client_view(client_view); | 313 scoped_ptr<DialogClientView> owned_client_view(client_view); |
| 313 toplevel1->CloseNow(); | 314 toplevel1->CloseNow(); |
| 314 toplevel2->CloseNow(); | 315 toplevel2->CloseNow(); |
| 315 EXPECT_EQ(NULL, owned_client_view->focus_manager_); | 316 EXPECT_EQ(NULL, owned_client_view->focus_manager_); |
| 316 } | 317 } |
| 317 | 318 |
| 318 } // namespace views | 319 } // namespace views |
| OLD | NEW |