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/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
291 view_list.push_back(VIEW_ID_INFO_BAR); | 291 view_list.push_back(VIEW_ID_INFO_BAR); |
292 view_list.push_back(VIEW_ID_FIND_BAR); | 292 view_list.push_back(VIEW_ID_FIND_BAR); |
293 view_list.push_back(VIEW_ID_TAB_CONTENT_AREA); | 293 view_list.push_back(VIEW_ID_TAB_CONTENT_AREA); |
294 view_list.push_back(VIEW_ID_DOWNLOAD_SHELF); | 294 view_list.push_back(VIEW_ID_DOWNLOAD_SHELF); |
295 VerifyZOrder(view_list); | 295 VerifyZOrder(view_list); |
296 } | 296 } |
297 | 297 |
298 // Presentation mode with Instant results showing. Should be exact same as | 298 // Presentation mode with Instant results showing. Should be exact same as |
299 // non-Instant presentation mode. | 299 // non-Instant presentation mode. |
300 IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest, | 300 IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest, |
301 ZOrderInstantPresentationMode) { | 301 DISABLED_ZOrderInstantPresentationMode) { |
302 // TODO(kbr): re-enable: http://crbug.com/222296 | 302 // TODO(kbr): re-enable: http://crbug.com/222296 |
303 if (base::mac::IsOSMountainLionOrLater()) | 303 if (base::mac::IsOSMountainLionOrLater()) |
304 return; | 304 return; |
305 | 305 |
306 chrome::ToggleFullscreenMode(browser()); | 306 chrome::ToggleFullscreenMode(browser()); |
307 ShowInstantResults(); | 307 ShowInstantResults(); |
308 browser()->GetFindBarController(); // add find bar | 308 browser()->GetFindBarController(); // add find bar |
309 | 309 |
310 std::vector<ViewID> view_list; | 310 std::vector<ViewID> view_list; |
311 view_list.push_back(VIEW_ID_INFO_BAR); | 311 view_list.push_back(VIEW_ID_INFO_BAR); |
312 view_list.push_back(VIEW_ID_TAB_CONTENT_AREA); | 312 view_list.push_back(VIEW_ID_TAB_CONTENT_AREA); |
313 view_list.push_back(VIEW_ID_FULLSCREEN_FLOATING_BAR); | 313 view_list.push_back(VIEW_ID_FULLSCREEN_FLOATING_BAR); |
314 view_list.push_back(VIEW_ID_BOOKMARK_BAR); | 314 view_list.push_back(VIEW_ID_BOOKMARK_BAR); |
315 view_list.push_back(VIEW_ID_TOOLBAR); | 315 view_list.push_back(VIEW_ID_TOOLBAR); |
316 view_list.push_back(VIEW_ID_FIND_BAR); | 316 view_list.push_back(VIEW_ID_FIND_BAR); |
317 view_list.push_back(VIEW_ID_DOWNLOAD_SHELF); | 317 view_list.push_back(VIEW_ID_DOWNLOAD_SHELF); |
318 VerifyZOrder(view_list); | 318 VerifyZOrder(view_list); |
319 } | 319 } |
320 | 320 |
321 // Verify that if the fullscreen floating bar view is below the tab content area | 321 // Verify that if the fullscreen floating bar view is below the tab content area |
322 // then calling |updateSubviewZOrder:| will correctly move back above. | 322 // then calling |updateSubviewZOrder:| will correctly move back above. |
323 IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest, | 323 IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest, |
324 FloatingBarBelowContentView) { | 324 DISABLED_FloatingBarBelowContentView) { |
325 // TODO(kbr): re-enable: http://crbug.com/222296 | 325 // TODO(kbr): re-enable: http://crbug.com/222296 |
326 if (base::mac::IsOSMountainLionOrLater()) | 326 if (base::mac::IsOSMountainLionOrLater()) |
327 return; | 327 return; |
328 | 328 |
329 chrome::ToggleFullscreenMode(browser()); | 329 chrome::ToggleFullscreenMode(browser()); |
330 | 330 |
331 NSView* fullscreen_floating_bar = | 331 NSView* fullscreen_floating_bar = |
332 GetViewWithID(VIEW_ID_FULLSCREEN_FLOATING_BAR); | 332 GetViewWithID(VIEW_ID_FULLSCREEN_FLOATING_BAR); |
333 [fullscreen_floating_bar removeFromSuperview]; | 333 [fullscreen_floating_bar removeFromSuperview]; |
334 [[[controller() window] contentView] addSubview:fullscreen_floating_bar | 334 [[[controller() window] contentView] addSubview:fullscreen_floating_bar |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
367 [overlay activeContainerOffset]); | 367 [overlay activeContainerOffset]); |
368 | 368 |
369 // Minus bookmark bar. | 369 // Minus bookmark bar. |
370 browser()->window()->ToggleBookmarkBar(); | 370 browser()->window()->ToggleBookmarkBar(); |
371 EXPECT_EQ(GetViewHeight(VIEW_ID_INFO_BAR), [overlay activeContainerOffset]); | 371 EXPECT_EQ(GetViewHeight(VIEW_ID_INFO_BAR), [overlay activeContainerOffset]); |
372 } | 372 } |
373 | 373 |
374 // Verify that in non-Instant presentation mode the content area is beneath | 374 // Verify that in non-Instant presentation mode the content area is beneath |
375 // the info bar. | 375 // the info bar. |
376 IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest, | 376 IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest, |
377 ContentOffsetPresentationMode) { | 377 DISABLED_ContentOffsetPresentationMode) { |
378 // TODO(kbr): re-enable: http://crbug.com/222296 | 378 // TODO(kbr): re-enable: http://crbug.com/222296 |
379 if (base::mac::IsOSMountainLionOrLater()) | 379 if (base::mac::IsOSMountainLionOrLater()) |
380 return; | 380 return; |
381 | 381 |
382 chrome::ToggleFullscreenMode(browser()); | 382 chrome::ToggleFullscreenMode(browser()); |
383 OverlayableContentsController* overlay = | 383 OverlayableContentsController* overlay = |
384 [controller() overlayableContentsController]; | 384 [controller() overlayableContentsController]; |
385 | 385 |
386 // Just toolbar. | 386 // Just toolbar. |
387 EXPECT_EQ(0, [overlay activeContainerOffset]); | 387 EXPECT_EQ(0, [overlay activeContainerOffset]); |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
457 | 457 |
458 NSView* bookmarkView = [[controller() bookmarkBarController] view]; | 458 NSView* bookmarkView = [[controller() bookmarkBarController] view]; |
459 NSView* contentView = [[controller() window] contentView]; | 459 NSView* contentView = [[controller() window] contentView]; |
460 NSPoint point = [bookmarkView convertPoint:NSMakePoint(1, 1) | 460 NSPoint point = [bookmarkView convertPoint:NSMakePoint(1, 1) |
461 toView:[contentView superview]]; | 461 toView:[contentView superview]]; |
462 | 462 |
463 EXPECT_FALSE([[contentView hitTest:point] isDescendantOf:bookmarkView]); | 463 EXPECT_FALSE([[contentView hitTest:point] isDescendantOf:bookmarkView]); |
464 EXPECT_TRUE([[contentView hitTest:point] | 464 EXPECT_TRUE([[contentView hitTest:point] |
465 isDescendantOf:[controller() tabContentArea]]); | 465 isDescendantOf:[controller() tabContentArea]]); |
466 } | 466 } |
OLD | NEW |