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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm b/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm
index 7fc40f260da35c66c61dbf9e037ec1a6aaaf0ba9..adb1817441a0b6ecb7080f42fbf42f41839e22be 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm
@@ -22,6 +22,7 @@
#include "chrome/browser/ui/cocoa/browser_window_cocoa.h"
#import "chrome/browser/ui/cocoa/browser_window_controller_private.h"
#import "chrome/browser/ui/cocoa/fast_resize_view.h"
+#import "chrome/browser/ui/cocoa/history_overlay_controller.h"
#import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
#import "chrome/browser/ui/cocoa/nsview_additions.h"
#import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h"
@@ -33,6 +34,7 @@
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/testing_profile.h"
#include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_contents_view.h"
#import "testing/gtest_mac.h"
namespace {
@@ -643,3 +645,20 @@ IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest,
[[popupController infoBarContainerController]
shouldSuppressTopInfoBarTip]);
}
+
+// Verify that AllowOverlappingViews is set while the history overlay is
+// visible.
+IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest,
+ AllowOverlappingViewsHistoryOverlay) {
+ content::WebContentsView* web_contents_view =
+ browser()->tab_strip_model()->GetActiveWebContents()->GetView();
+ EXPECT_FALSE(web_contents_view->GetAllowOverlappingViews());
+
+ scoped_nsobject<HistoryOverlayController> overlay(
+ [[HistoryOverlayController alloc] initForMode:kHistoryOverlayModeBack]);
+ [overlay showPanelForView:web_contents_view->GetNativeView()];
+ EXPECT_TRUE(web_contents_view->GetAllowOverlappingViews());
+
+ overlay.reset();
+ EXPECT_FALSE(web_contents_view->GetAllowOverlappingViews());
+}
« 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