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

Side by Side Diff: chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm

Issue 16632009: Set AllowOverlappingViews for history overlay (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix comment Created 7 years, 6 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 | Annotate | Revision Log
OLDNEW
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/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
11 #include "chrome/browser/infobars/confirm_infobar_delegate.h" 11 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
12 #include "chrome/browser/infobars/infobar_service.h" 12 #include "chrome/browser/infobars/infobar_service.h"
13 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/profiles/profile_manager.h" 14 #include "chrome/browser/profiles/profile_manager.h"
15 #include "chrome/browser/search/search.h" 15 #include "chrome/browser/search/search.h"
16 #include "chrome/browser/ui/browser.h" 16 #include "chrome/browser/ui/browser.h"
17 #include "chrome/browser/ui/browser_commands.h" 17 #include "chrome/browser/ui/browser_commands.h"
18 #include "chrome/browser/ui/browser_list.h" 18 #include "chrome/browser/ui/browser_list.h"
19 #include "chrome/browser/ui/browser_tabstrip.cc" 19 #include "chrome/browser/ui/browser_tabstrip.cc"
20 #include "chrome/browser/ui/browser_window.h" 20 #include "chrome/browser/ui/browser_window.h"
21 #import "chrome/browser/ui/cocoa/browser/avatar_button_controller.h" 21 #import "chrome/browser/ui/cocoa/browser/avatar_button_controller.h"
22 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h" 22 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h"
23 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h" 23 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h"
24 #import "chrome/browser/ui/cocoa/fast_resize_view.h" 24 #import "chrome/browser/ui/cocoa/fast_resize_view.h"
25 #import "chrome/browser/ui/cocoa/history_overlay_controller.h"
25 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h" 26 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
26 #import "chrome/browser/ui/cocoa/nsview_additions.h" 27 #import "chrome/browser/ui/cocoa/nsview_additions.h"
27 #import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h" 28 #import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h"
28 #include "chrome/browser/ui/extensions/application_launch.h" 29 #include "chrome/browser/ui/extensions/application_launch.h"
29 #include "chrome/browser/ui/find_bar/find_bar_controller.h" 30 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
30 #include "chrome/browser/ui/find_bar/find_bar.h" 31 #include "chrome/browser/ui/find_bar/find_bar.h"
31 #include "chrome/browser/ui/search/search_model.h" 32 #include "chrome/browser/ui/search/search_model.h"
32 #include "chrome/browser/ui/tabs/tab_strip_model.h" 33 #include "chrome/browser/ui/tabs/tab_strip_model.h"
33 #include "chrome/test/base/in_process_browser_test.h" 34 #include "chrome/test/base/in_process_browser_test.h"
34 #include "chrome/test/base/testing_profile.h" 35 #include "chrome/test/base/testing_profile.h"
35 #include "content/public/browser/web_contents.h" 36 #include "content/public/browser/web_contents.h"
37 #include "content/public/browser/web_contents_view.h"
36 #import "testing/gtest_mac.h" 38 #import "testing/gtest_mac.h"
37 39
38 namespace { 40 namespace {
39 41
40 #if !defined(MAC_OS_X_VERSION_10_7) || \ 42 #if !defined(MAC_OS_X_VERSION_10_7) || \
41 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 43 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
42 enum { 44 enum {
43 NSWindowDocumentVersionsButton = 6, 45 NSWindowDocumentVersionsButton = 6,
44 NSWindowFullScreenButton 46 NSWindowFullScreenButton
45 }; 47 };
(...skipping 590 matching lines...) Expand 10 before | Expand all | Expand 10 after
636 InfoBarService* service = InfoBarService::FromWebContents(web_contents); 638 InfoBarService* service = InfoBarService::FromWebContents(web_contents);
637 scoped_ptr<InfoBarDelegate> info_bar_delegate(new DummyInfoBar(service)); 639 scoped_ptr<InfoBarDelegate> info_bar_delegate(new DummyInfoBar(service));
638 [[popupController infoBarContainerController] 640 [[popupController infoBarContainerController]
639 addInfoBar:info_bar_delegate->CreateInfoBar(service) 641 addInfoBar:info_bar_delegate->CreateInfoBar(service)
640 animate:NO]; 642 animate:NO];
641 643
642 EXPECT_TRUE( 644 EXPECT_TRUE(
643 [[popupController infoBarContainerController] 645 [[popupController infoBarContainerController]
644 shouldSuppressTopInfoBarTip]); 646 shouldSuppressTopInfoBarTip]);
645 } 647 }
648
649 // Verify that AllowOverlappingViews is set while the history overlay is
650 // visible.
651 IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest,
652 AllowOverlappingViewsHistoryOverlay) {
653 content::WebContentsView* web_contents_view =
654 browser()->tab_strip_model()->GetActiveWebContents()->GetView();
655 EXPECT_FALSE(web_contents_view->GetAllowOverlappingViews());
656
657 scoped_nsobject<HistoryOverlayController> overlay(
658 [[HistoryOverlayController alloc] initForMode:kHistoryOverlayModeBack]);
659 [overlay showPanelForView:web_contents_view->GetNativeView()];
660 EXPECT_TRUE(web_contents_view->GetAllowOverlappingViews());
661
662 overlay.reset();
663 EXPECT_FALSE(web_contents_view->GetAllowOverlappingViews());
664 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_controller.mm ('k') | chrome/browser/ui/cocoa/browser_window_controller_private.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698