| Index: ui/views/focus/focus_manager_unittest.cc
|
| diff --git a/ui/views/focus/focus_manager_unittest.cc b/ui/views/focus/focus_manager_unittest.cc
|
| index 5c5dcf7b1c932bae7799dc6c12dfff1a7bef9151..332d65d415bca979767a45c8572f1dace0900c06 100644
|
| --- a/ui/views/focus/focus_manager_unittest.cc
|
| +++ b/ui/views/focus/focus_manager_unittest.cc
|
| @@ -178,7 +178,8 @@ class TestTextfield : public Textfield {
|
|
|
| class TestTabbedPane : public TabbedPane {
|
| public:
|
| - TestTabbedPane() {}
|
| + TestTabbedPane()
|
| + : TabbedPane(false) {}
|
| virtual gfx::NativeView TestGetNativeControlView() {
|
| return native_tabbed_pane_->GetTestingHandle();
|
| }
|
| @@ -214,9 +215,9 @@ TEST_F(FocusManagerTest, DISABLED_FocusNativeControls) {
|
| TEST_F(FocusManagerTest, ContainsView) {
|
| View* view = new View();
|
| scoped_ptr<View> detached_view(new View());
|
| - TabbedPane* tabbed_pane = new TabbedPane();
|
| + TabbedPane* tabbed_pane = new TabbedPane(false);
|
| tabbed_pane->set_use_native_win_control(true);
|
| - TabbedPane* nested_tabbed_pane = new TabbedPane();
|
| + TabbedPane* nested_tabbed_pane = new TabbedPane(false);
|
| nested_tabbed_pane->set_use_native_win_control(true);
|
| NativeTextButton* tab_button = new NativeTextButton(
|
| NULL, ASCIIToUTF16("tab button"));
|
| @@ -640,7 +641,7 @@ class FocusManagerDtorTest : public FocusManagerTest {
|
| #if !defined(USE_AURA)
|
| TEST_F(FocusManagerDtorTest, FocusManagerDestructedLast) {
|
| // Setup views hierarchy.
|
| - TabbedPane* tabbed_pane = new TabbedPane();
|
| + TabbedPane* tabbed_pane = new TabbedPane(false);
|
| tabbed_pane->set_use_native_win_control(true);
|
| GetContentsView()->AddChildView(tabbed_pane);
|
|
|
|
|