2 files changed, 15 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/browser_window_controller.mm b/chrome/browser/cocoa/browser_window_controller.mm
index adfbb3e..3c8df3b 100644
--- a/chrome/browser/cocoa/browser_window_controller.mm
+++ b/chrome/browser/cocoa/browser_window_controller.mm
@@ -536,6 +536,9 @@ willPositionSheet:(NSWindow*)sheet
 }
 
 - (BOOL)supportsFullscreen {
+  // Fullscreen mode disabled for Mstone-4 / ReleaseBlock-Beta.
+  return NO;
+
   // TODO(avi, thakis): GTMWindowSheetController has no api to move
   // tabsheets between windows. Until then, we have to prevent having to
   // move a tabsheet between windows, e.g. no fullscreen toggling
diff --git a/chrome/browser/cocoa/browser_window_controller_unittest.mm b/chrome/browser/cocoa/browser_window_controller_unittest.mm
index 5533453..b5f504e 100644
--- a/chrome/browser/cocoa/browser_window_controller_unittest.mm
+++ b/chrome/browser/cocoa/browser_window_controller_unittest.mm
@@ -457,7 +457,17 @@ class BrowserWindowFullScreenControllerTest : public CocoaTest {
   BrowserWindowController* controller_;
 };
 
-TEST_F(BrowserWindowFullScreenControllerTest, TestFullscreen) {
+@interface BrowserWindowController (PrivateAPI)
+- (BOOL)supportsFullscreen;
+@end
+
+// Fullscreen mode disabled for Mstone-4 / ReleaseBlock-Beta.
+// Confirm we don't accidentally turn it back on.
+TEST_F(BrowserWindowFullScreenControllerTest, ConfirmFullscreenDisabled) {
+  EXPECT_FALSE([controller_ supportsFullscreen]);
+}
+
+TEST_F(BrowserWindowFullScreenControllerTest, DISABLED_TestFullscreen) {
   EXPECT_FALSE([controller_ isFullscreen]);
   [controller_ setFullscreen:YES];
   EXPECT_TRUE([controller_ isFullscreen]);
@@ -465,7 +475,7 @@ TEST_F(BrowserWindowFullScreenControllerTest, TestFullscreen) {
   EXPECT_FALSE([controller_ isFullscreen]);
 }
 
-TEST_F(BrowserWindowFullScreenControllerTest, TestActivate) {
+TEST_F(BrowserWindowFullScreenControllerTest, DISABLED_TestActivate) {
   EXPECT_FALSE([controller_ isFullscreen]);
 
   [controller_ activate];