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

Unified Diff: chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm

Issue 11359148: Merge 166410 - Constrained Window Cocoa: Disable fullscreen (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1312/src/
Patch Set: Created 8 years, 1 month 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
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_controller_unittest.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm
===================================================================
--- chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm (revision 167005)
+++ chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm (working copy)
@@ -4,7 +4,9 @@
#include "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac2.h"
+#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/cocoa/browser_window_controller.h"
#include "chrome/browser/ui/tab_contents/tab_contents.h"
@@ -119,3 +121,16 @@
1, TabStripModel::CLOSE_USER_GESTURE));
EXPECT_EQ(1, browser()->tab_count());
}
+
+// Test that adding a sheet disables fullscreen.
+IN_PROC_BROWSER_TEST_F(ConstrainedWindowMacTest, Fullscreen) {
+ EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FULLSCREEN));
+
+ // Dialog will delete it self when closed.
+ NiceMock<ConstrainedWindowDelegateMock> delegate;
+ ConstrainedWindowMac2 dialog(&delegate, tab1_, sheet_);
+
+ EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_FULLSCREEN));
+
+ dialog.CloseConstrainedWindow();
+}
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_controller_unittest.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698