OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "chrome/browser/ui/views/frame/browser_view.h" | 5 #include "chrome/browser/ui/views/frame/browser_view.h" |
6 | 6 |
7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
8 #include "chrome/browser/ui/browser.h" | 8 #include "chrome/browser/ui/browser.h" |
9 #include "chrome/browser/ui/browser_commands.h" | 9 #include "chrome/browser/ui/browser_commands.h" |
10 #include "chrome/browser/ui/browser_tabstrip.h" | 10 #include "chrome/browser/ui/browser_tabstrip.h" |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 ASSERT_TRUE(IsViewFocused(VIEW_ID_OMNIBOX)); | 49 ASSERT_TRUE(IsViewFocused(VIEW_ID_OMNIBOX)); |
50 // Hide the window, show it again, the focus should not have changed. | 50 // Hide the window, show it again, the focus should not have changed. |
51 ui_test_utils::HideNativeWindow(window); | 51 ui_test_utils::HideNativeWindow(window); |
52 ASSERT_TRUE(ui_test_utils::ShowAndFocusNativeWindow(window)); | 52 ASSERT_TRUE(ui_test_utils::ShowAndFocusNativeWindow(window)); |
53 ASSERT_TRUE(IsViewFocused(VIEW_ID_OMNIBOX)); | 53 ASSERT_TRUE(IsViewFocused(VIEW_ID_OMNIBOX)); |
54 | 54 |
55 // The rest of this test does not make sense on Linux because the behavior | 55 // The rest of this test does not make sense on Linux because the behavior |
56 // of Activate() is not well defined and can vary by window manager. | 56 // of Activate() is not well defined and can vary by window manager. |
57 #if defined(OS_WIN) | 57 #if defined(OS_WIN) |
58 // Open a new browser window. | 58 // Open a new browser window. |
59 Browser* browser2 = | 59 Browser* browser2 = new Browser(Browser::CreateParams(browser()->profile())); |
60 new Browser(Browser::CreateParams(browser()->profile(), | |
61 browser()->host_desktop_type())); | |
62 ASSERT_TRUE(browser2); | 60 ASSERT_TRUE(browser2); |
63 chrome::AddTabAt(browser2, GURL(), -1, true); | 61 chrome::AddTabAt(browser2, GURL(), -1, true); |
64 browser2->window()->Show(); | 62 browser2->window()->Show(); |
65 ui_test_utils::NavigateToURL(browser2, url); | 63 ui_test_utils::NavigateToURL(browser2, url); |
66 | 64 |
67 gfx::NativeWindow window2 = browser2->window()->GetNativeWindow(); | 65 gfx::NativeWindow window2 = browser2->window()->GetNativeWindow(); |
68 BrowserView* browser_view2 = BrowserView::GetBrowserViewForBrowser(browser2); | 66 BrowserView* browser_view2 = BrowserView::GetBrowserViewForBrowser(browser2); |
69 ASSERT_TRUE(browser_view2); | 67 ASSERT_TRUE(browser_view2); |
70 const views::Widget* widget2 = | 68 const views::Widget* widget2 = |
71 views::Widget::GetWidgetForNativeWindow(window2); | 69 views::Widget::GetWidgetForNativeWindow(window2); |
(...skipping 14 matching lines...) Expand all Loading... |
86 views::Widget* widget = views::Widget::GetWidgetForNativeWindow(window); | 84 views::Widget* widget = views::Widget::GetWidgetForNativeWindow(window); |
87 ASSERT_TRUE(widget); | 85 ASSERT_TRUE(widget); |
88 EXPECT_EQ(nullptr, widget->GetFocusManager()->GetFocusedView()); | 86 EXPECT_EQ(nullptr, widget->GetFocusManager()->GetFocusedView()); |
89 EXPECT_EQ(browser_view2->GetTabContentsContainerView(), | 87 EXPECT_EQ(browser_view2->GetTabContentsContainerView(), |
90 focus_manager2->GetFocusedView()); | 88 focus_manager2->GetFocusedView()); |
91 | 89 |
92 // Close the 2nd browser to avoid a DCHECK(). | 90 // Close the 2nd browser to avoid a DCHECK(). |
93 browser_view2->Close(); | 91 browser_view2->Close(); |
94 #endif | 92 #endif |
95 } | 93 } |
OLD | NEW |