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/logging.h" | 5 #include "base/logging.h" |
6 #include "base/scoped_ptr.h" | 6 #include "base/scoped_ptr.h" |
7 #include "testing/gtest/include/gtest/gtest.h" | 7 #include "testing/gtest/include/gtest/gtest.h" |
8 #include "ui/views/view.h" | 8 #include "ui/views/view.h" |
9 #include "ui/views/widget/widget.h" | 9 #include "ui/views/widget/widget.h" |
10 #include "ui/views/widget/widget_test_util.h" | 10 #include "ui/views/widget/widget_test_util.h" |
(...skipping 14 matching lines...) Expand all Loading... |
25 View v; | 25 View v; |
26 v.set_parent_owned(false); | 26 v.set_parent_owned(false); |
27 scoped_ptr<Widget> widget(CreateWidgetWithContents(&v)); | 27 scoped_ptr<Widget> widget(CreateWidgetWithContents(&v)); |
28 | 28 |
29 v.RequestFocus(); | 29 v.RequestFocus(); |
30 | 30 |
31 FocusManager* focus_manager = widget->GetFocusManager(); | 31 FocusManager* focus_manager = widget->GetFocusManager(); |
32 EXPECT_TRUE(focus_manager != NULL); | 32 EXPECT_TRUE(focus_manager != NULL); |
33 EXPECT_EQ(&v, focus_manager->focused_view()); | 33 EXPECT_EQ(&v, focus_manager->focused_view()); |
34 | 34 |
35 v.parent()->RemoveChildView(&v); | 35 v.parent()->RemoveChildView(&v, false); |
36 | 36 |
37 EXPECT_NE(&v, focus_manager->focused_view()); | 37 EXPECT_NE(&v, focus_manager->focused_view()); |
38 EXPECT_EQ(NULL, focus_manager->focused_view()); | 38 EXPECT_EQ(NULL, focus_manager->focused_view()); |
39 } | 39 } |
40 | 40 |
41 } // namespace internal | 41 } // namespace internal |
42 } // namespace ui | 42 } // namespace ui |
OLD | NEW |