OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #import "chrome/browser/ui/cocoa/browser_window_controller.h" | 5 #import "chrome/browser/ui/cocoa/browser_window_controller.h" |
6 | 6 |
7 #import "base/mac/mac_util.h" | 7 #import "base/mac/mac_util.h" |
8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
10 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h" | 10 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h" |
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
264 view_list.push_back(VIEW_ID_TOOLBAR); | 264 view_list.push_back(VIEW_ID_TOOLBAR); |
265 view_list.push_back(VIEW_ID_INFO_BAR); | 265 view_list.push_back(VIEW_ID_INFO_BAR); |
266 view_list.push_back(VIEW_ID_TAB_CONTENT_AREA); | 266 view_list.push_back(VIEW_ID_TAB_CONTENT_AREA); |
267 view_list.push_back(VIEW_ID_FIND_BAR); | 267 view_list.push_back(VIEW_ID_FIND_BAR); |
268 view_list.push_back(VIEW_ID_DOWNLOAD_SHELF); | 268 view_list.push_back(VIEW_ID_DOWNLOAD_SHELF); |
269 VerifyZOrder(view_list); | 269 VerifyZOrder(view_list); |
270 } | 270 } |
271 | 271 |
272 // Verify that in non-instant presentation mode that the info bar is below the | 272 // Verify that in non-instant presentation mode that the info bar is below the |
273 // content are and everything else is above it. | 273 // content are and everything else is above it. |
274 IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest, ZOrderPresentationMode) { | 274 // DISABLED due to flaky failures on trybots. http://crbug.com/178778 |
| 275 IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest, |
| 276 DISABLED_ZOrderPresentationMode) { |
275 chrome::ToggleFullscreenMode(browser()); | 277 chrome::ToggleFullscreenMode(browser()); |
276 browser()->GetFindBarController(); // add find bar | 278 browser()->GetFindBarController(); // add find bar |
277 | 279 |
278 std::vector<ViewID> view_list; | 280 std::vector<ViewID> view_list; |
279 view_list.push_back(VIEW_ID_INFO_BAR); | 281 view_list.push_back(VIEW_ID_INFO_BAR); |
280 view_list.push_back(VIEW_ID_TAB_CONTENT_AREA); | 282 view_list.push_back(VIEW_ID_TAB_CONTENT_AREA); |
281 view_list.push_back(VIEW_ID_FULLSCREEN_FLOATING_BAR); | 283 view_list.push_back(VIEW_ID_FULLSCREEN_FLOATING_BAR); |
282 view_list.push_back(VIEW_ID_BOOKMARK_BAR); | 284 view_list.push_back(VIEW_ID_BOOKMARK_BAR); |
283 view_list.push_back(VIEW_ID_TOOLBAR); | 285 view_list.push_back(VIEW_ID_TOOLBAR); |
284 view_list.push_back(VIEW_ID_FIND_BAR); | 286 view_list.push_back(VIEW_ID_FIND_BAR); |
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
452 | 454 |
453 NSView* bookmarkView = [[controller() bookmarkBarController] view]; | 455 NSView* bookmarkView = [[controller() bookmarkBarController] view]; |
454 NSView* contentView = [[controller() window] contentView]; | 456 NSView* contentView = [[controller() window] contentView]; |
455 NSPoint point = [bookmarkView convertPoint:NSMakePoint(1, 1) | 457 NSPoint point = [bookmarkView convertPoint:NSMakePoint(1, 1) |
456 toView:[contentView superview]]; | 458 toView:[contentView superview]]; |
457 | 459 |
458 EXPECT_FALSE([[contentView hitTest:point] isDescendantOf:bookmarkView]); | 460 EXPECT_FALSE([[contentView hitTest:point] isDescendantOf:bookmarkView]); |
459 EXPECT_TRUE([[contentView hitTest:point] | 461 EXPECT_TRUE([[contentView hitTest:point] |
460 isDescendantOf:[controller() tabContentArea]]); | 462 isDescendantOf:[controller() tabContentArea]]); |
461 } | 463 } |
OLD | NEW |