Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(800)

Side by Side Diff: chrome/browser/ui/views/frame/browser_view_focus_uitest.cc

Issue 2685333005: ash: fix regression where ctrl+n put new window on wrong desktop (Closed)
Patch Set: Rebase to ToT Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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 = new Browser(Browser::CreateParams(browser()->profile())); 59 Browser* browser2 =
60 new Browser(Browser::CreateParams(browser()->profile(), true));
60 ASSERT_TRUE(browser2); 61 ASSERT_TRUE(browser2);
61 chrome::AddTabAt(browser2, GURL(), -1, true); 62 chrome::AddTabAt(browser2, GURL(), -1, true);
62 browser2->window()->Show(); 63 browser2->window()->Show();
63 ui_test_utils::NavigateToURL(browser2, url); 64 ui_test_utils::NavigateToURL(browser2, url);
64 65
65 gfx::NativeWindow window2 = browser2->window()->GetNativeWindow(); 66 gfx::NativeWindow window2 = browser2->window()->GetNativeWindow();
66 BrowserView* browser_view2 = BrowserView::GetBrowserViewForBrowser(browser2); 67 BrowserView* browser_view2 = BrowserView::GetBrowserViewForBrowser(browser2);
67 ASSERT_TRUE(browser_view2); 68 ASSERT_TRUE(browser_view2);
68 const views::Widget* widget2 = 69 const views::Widget* widget2 =
69 views::Widget::GetWidgetForNativeWindow(window2); 70 views::Widget::GetWidgetForNativeWindow(window2);
(...skipping 14 matching lines...) Expand all
84 views::Widget* widget = views::Widget::GetWidgetForNativeWindow(window); 85 views::Widget* widget = views::Widget::GetWidgetForNativeWindow(window);
85 ASSERT_TRUE(widget); 86 ASSERT_TRUE(widget);
86 EXPECT_EQ(nullptr, widget->GetFocusManager()->GetFocusedView()); 87 EXPECT_EQ(nullptr, widget->GetFocusManager()->GetFocusedView());
87 EXPECT_EQ(browser_view2->GetTabContentsContainerView(), 88 EXPECT_EQ(browser_view2->GetTabContentsContainerView(),
88 focus_manager2->GetFocusedView()); 89 focus_manager2->GetFocusedView());
89 90
90 // Close the 2nd browser to avoid a DCHECK(). 91 // Close the 2nd browser to avoid a DCHECK().
91 browser_view2->Close(); 92 browser_view2->Close();
92 #endif 93 #endif
93 } 94 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698