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 "base/macros.h" | 7 #include "base/macros.h" |
8 #include "chrome/browser/devtools/devtools_window_testing.h" | 8 #include "chrome/browser/devtools/devtools_window_testing.h" |
9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
10 #include "chrome/browser/ui/browser_tabstrip.h" | 10 #include "chrome/browser/ui/browser_tabstrip.h" |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
102 chrome::AddTabAt(browser2, GURL(), -1, true); | 102 chrome::AddTabAt(browser2, GURL(), -1, true); |
103 browser2->tab_strip_model()->ActivateTabAt(0, true); | 103 browser2->tab_strip_model()->ActivateTabAt(0, true); |
104 TestWebContentsObserver observer( | 104 TestWebContentsObserver observer( |
105 browser2->tab_strip_model()->GetWebContentsAt(0), | 105 browser2->tab_strip_model()->GetWebContentsAt(0), |
106 browser2->tab_strip_model()->GetWebContentsAt(1)); | 106 browser2->tab_strip_model()->GetWebContentsAt(1)); |
107 BrowserView::GetBrowserViewForBrowser(browser2)->GetWidget()->CloseNow(); | 107 BrowserView::GetBrowserViewForBrowser(browser2)->GetWidget()->CloseNow(); |
108 } | 108 } |
109 | 109 |
110 // Verifies that page and devtools WebViews are being correctly layed out | 110 // Verifies that page and devtools WebViews are being correctly layed out |
111 // when DevTools is opened/closed/updated/undocked. | 111 // when DevTools is opened/closed/updated/undocked. |
112 IN_PROC_BROWSER_TEST_F(BrowserViewTest, DevToolsUpdatesBrowserWindow) { | 112 |
| 113 // Flaky on Chrome OS. http://crbug.com/693000 |
| 114 #if defined(OS_CHROMEOS) |
| 115 #define MAYBE_DevToolsUpdatesBrowserWindow DISABLED_DevToolsUpdatesBrowserWindow |
| 116 #else |
| 117 #define MAYBE_DevToolsUpdatesBrowserWindow DevToolsUpdatesBrowserWindow |
| 118 #endif |
| 119 IN_PROC_BROWSER_TEST_F(BrowserViewTest, MAYBE_DevToolsUpdatesBrowserWindow) { |
113 gfx::Rect full_bounds = | 120 gfx::Rect full_bounds = |
114 browser_view()->GetContentsContainerForTest()->GetLocalBounds(); | 121 browser_view()->GetContentsContainerForTest()->GetLocalBounds(); |
115 gfx::Rect small_bounds(10, 20, 30, 40); | 122 gfx::Rect small_bounds(10, 20, 30, 40); |
116 | 123 |
117 browser_view()->UpdateDevTools(); | 124 browser_view()->UpdateDevTools(); |
118 EXPECT_FALSE(devtools_web_view()->web_contents()); | 125 EXPECT_FALSE(devtools_web_view()->web_contents()); |
119 EXPECT_EQ(full_bounds, devtools_web_view()->bounds()); | 126 EXPECT_EQ(full_bounds, devtools_web_view()->bounds()); |
120 EXPECT_EQ(full_bounds, contents_web_view()->bounds()); | 127 EXPECT_EQ(full_bounds, contents_web_view()->bounds()); |
121 | 128 |
122 // Docked. | 129 // Docked. |
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
227 EXPECT_EQ(0, observer.change_count()); | 234 EXPECT_EQ(0, observer.change_count()); |
228 observer.clear_change_count(); | 235 observer.clear_change_count(); |
229 | 236 |
230 browser()->tab_strip_model()->ActivateTabAt(1, true); | 237 browser()->tab_strip_model()->ActivateTabAt(1, true); |
231 EXPECT_TRUE(bookmark_bar->visible()); | 238 EXPECT_TRUE(bookmark_bar->visible()); |
232 EXPECT_EQ(0, observer.change_count()); | 239 EXPECT_EQ(0, observer.change_count()); |
233 observer.clear_change_count(); | 240 observer.clear_change_count(); |
234 | 241 |
235 browser_view()->bookmark_bar()->RemoveObserver(&observer); | 242 browser_view()->bookmark_bar()->RemoveObserver(&observer); |
236 } | 243 } |
OLD | NEW |