Polish Tabstrip and Overlay Issues in Fullscreen

chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.h"
+#include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
+#include "chrome/browser/ui/exclusive_access/fullscreen_controller_test.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "content/public/browser/web_contents.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "url/gurl.h"
 
 using ::testing::NiceMock;
 
 namespace {
 
@@ skipping 124 matching lines @@
   ConstrainedWindowMac dialog(&delegate, tab1_, sheet_);
   EXPECT_EQ(1.0, [sheet_window_ alphaValue]);
 
   // Close the tab.
   TabStripModel* tab_strip = browser()->tab_strip_model();
   EXPECT_EQ(2, tab_strip->count());
   EXPECT_TRUE(tab_strip->CloseWebContentsAt(1,
                                             TabStripModel::CLOSE_USER_GESTURE));
   EXPECT_EQ(1, tab_strip->count());
 }
+
+// Test that the sheet is still visible after entering and exiting fullscreen.
+IN_PROC_BROWSER_TEST_F(ConstrainedWindowMacTest, BrowserWindowFullscreen) {
+  NiceMock<ConstrainedWindowDelegateMock> delegate;
+  ConstrainedWindowMac dialog(&delegate, tab1_, sheet_);
+  EXPECT_EQ(1.0, [sheet_window_ alphaValue]);
+
+  // Toggle fullscreen twice: one for entering and one for exiting.
+  // Check to see if the sheet is visible.
+  for (int i = 0; i < 2; i++) {
+    {
+      // NOTIFICATION_FULLSCREEN_CHANGED is sent asynchronously. Wait for the
+      // notification before testing the sheet's visibility.
+      scoped_ptr<FullscreenNotificationObserver> waiter(
+          new FullscreenNotificationObserver());

[Robert Sesek, 2015/12/09 16:29:05]

This can probably be created on the stack ?

[spqchan, 2015/12/09 20:07:30]

I tried it and it didn't work out.
I dug around and it looks like it will Wait once. After that, it will return
immediately:
https://code.google.com/p/chromium/codesearch#chromium/src/content/public/tes...

+      browser()
+          ->exclusive_access_manager()
+          ->fullscreen_controller()
+          ->ToggleBrowserFullscreenMode();
+      waiter->Wait();

[Robert Sesek, 2015/12/09 16:29:05]

EXPECT that the alphaValue goes to 0 after the first one?

[spqchan, 2015/12/09 20:07:30]

No, since we are checking after it goes fullscreen, the sheet should be visible.
So it will be 1.0 for both.

[Robert Sesek, 2015/12/09 20:12:27]

Ah, right. I guess there isn't a good way to test that it gets hidden, then.

+    }
+    EXPECT_EQ(1.0, [sheet_window_ alphaValue]);
+  }
+
+  dialog.CloseWebContentsModalDialog();
+}