Allow inline install for user initiated fullscreen mode since this mode requires that the user initiate it and due to a nuance with mac windows where the green maximize button enters fullscreen.

ackermanb · Commit bot · commit e6d00f176148 · 2017-02-15T19:02:16.000Z
BUG=690523 Review-Url: https://codereview.chromium.org/2693183002 Cr-Commit-Position: refs/heads/master@{#450753}
diff --git a/chrome/browser/extensions/webstore_inline_installer.cc b/chrome/browser/extensions/webstore_inline_installer.cc
@@ -184,7 +184,7 @@ bool WebstoreInlineInstaller::CheckInlineInstallPermitted(
   }
   FullscreenController* controller =
       browser->exclusive_access_manager()->fullscreen_controller();
-  if (controller->IsFullscreenForBrowser() || controller->IsTabFullscreen()) {
+  if (controller->IsTabFullscreen()) {
     *error = kInitiatedFromFullscreenError;
     return false;
   }
diff --git a/chrome/browser/extensions/webstore_inline_installer_browsertest.cc b/chrome/browser/extensions/webstore_inline_installer_browsertest.cc
@@ -263,12 +263,13 @@ IN_PROC_BROWSER_TEST_F(WebstoreInlineInstallerTest,
   RunTest(popup_contents, "runTest");
 }
 
-// Prevent inline install while in browser fullscreen mode. Browser fullscreen
-// is initiated by the user using F11.
+// Allow inline install while in browser fullscreen mode. Browser fullscreen
+// is initiated by the user using F11 (windows), ctrl+cmd+F (mac) or the green
+// maximize window button on mac. This will be allowed since it cannot be
+// initiated by an API and because of the nuance with mac windows.
 IN_PROC_BROWSER_TEST_F(WebstoreInlineInstallerTest,
-                       BlockInlineInstallFromFullscreenForBrowser) {
-  const GURL install_url =
-      GenerateTestServerUrl(kAppDomain, "install_from_fullscreen.html");
+                       AllowInlineInstallFromFullscreenForBrowser) {
+  const GURL install_url = GenerateTestServerUrl(kAppDomain, "install.html");
   ui_test_utils::NavigateToURL(browser(), install_url);
   AutoAcceptInstall();
 
@@ -279,10 +280,10 @@ IN_PROC_BROWSER_TEST_F(WebstoreInlineInstallerTest,
 
   RunTest("runTest");
 
-  // Ensure extension is not installed.
+  // Ensure extension is installed.
   ExtensionRegistry* registry = ExtensionRegistry::Get(profile());
-  EXPECT_FALSE(registry->GenerateInstalledExtensionsSet()->Contains(
-      "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"));
+  EXPECT_TRUE(
+      registry->GenerateInstalledExtensionsSet()->Contains(kTestExtensionId));
 }
 
 // Prevent inline install while in tab fullscreen mode. Tab fullscreen is
@@ -305,8 +306,8 @@ IN_PROC_BROWSER_TEST_F(WebstoreInlineInstallerTest,
 
   // Ensure extension is not installed.
   ExtensionRegistry* registry = ExtensionRegistry::Get(profile());
-  EXPECT_FALSE(registry->GenerateInstalledExtensionsSet()->Contains(
-      "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"));
+  EXPECT_FALSE(
+      registry->GenerateInstalledExtensionsSet()->Contains(kTestExtensionId));
 }
 
 // Ensure that inline-installing a disabled extension simply re-enables it.
diff --git a/chrome/test/data/extensions/api_test/webstore_inline_install/install_from_fullscreen.html b/chrome/test/data/extensions/api_test/webstore_inline_install/install_from_fullscreen.html
@@ -13,7 +13,7 @@
     // Link URL has to be generated dynamically in order to include the right
     // port number. The ID corresponds to the data in the "extension" directory.
     document.getElementsByTagName('link')[0].href =
-        galleryUrl + '/detail/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb';
+        galleryUrl + '/detail/ecglahbcnmdpdciemllbhojghbkagdje';
 
     try {
       chrome.webstore.install(
