Do not put v1 app windows or popup windows into immersive fullscreen

chrome/browser/ui/ash/chrome_shell_delegate.cc

 // 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/ash/chrome_shell_delegate.h"
 
 #include "ash/ash_switches.h"
 #include "ash/host/root_window_host_factory.h"
 #include "ash/launcher/launcher_types.h"
 #include "ash/magnifier/magnifier_constants.h"
@@ skipping 141 matching lines @@
 
 void ChromeShellDelegate::ToggleFullscreen() {
   // Only toggle if the user has a window open.
   aura::Window* window = ash::wm::GetActiveWindow();
   if (!window)
     return;
 
   bool is_fullscreen = ash::wm::IsWindowFullscreen(window);
 
   // Windows which cannot be maximized should not be fullscreened.
-  if (is_fullscreen && !ash::wm::CanMaximizeWindow(window))
+  if (!is_fullscreen && !ash::wm::CanMaximizeWindow(window))
     return;
 
   Browser* browser = chrome::FindBrowserWithWindow(window);
   if (browser) {
-    chrome::ToggleFullscreenMode(browser);
+#if defined(OS_WIN)
+    if (browser->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_NATIVE) {
+      chrome::ToggleFullscreenMode(browser);
+      return;
+    }
+#endif  // OS_WIN
+    if (browser->is_app() && browser->app_type() != Browser::APP_TYPE_CHILD) {
+      // AppNonClientFrameViewAsh shows only the window controls and no other
+      // window decorations which is pretty close to fullscreen. Put v1 apps
+      // into maximized mode instead of fullscreen to avoid showing the ugly
+      // fullscreen exit bubble.
+      ash::wm::ToggleMaximizedWindow(window);
+    } else {
+      chrome::ToggleFullscreenMode(browser);
+    }
     return;
   }
 
   // |window| may belong to a shell window.
   ShellWindow* shell_window = extensions::ShellWindowRegistry::
       GetShellWindowForNativeWindowAnyProfile(window);
   if (shell_window) {
     if (is_fullscreen)
       shell_window->Restore();
     else
       shell_window->Fullscreen();
+    return;
   }
+
+  // |window| may belong to a dialog such as the task manager. Toggle its
+  // maximized state.
+  ash::wm::ToggleMaximizedWindow(window);
 }
 
 void ChromeShellDelegate::ToggleMaximized() {
   // Only toggle if the user has a window open.
   aura::Window* window = ash::wm::GetActiveWindow();
   if (!window)
     return;
 
-  // TODO(pkotwicz): If immersive mode replaces fullscreen, bind fullscreen to
-  // F4 and find a different key binding for maximize.
-  if (ImmersiveFullscreenConfiguration::UseImmersiveFullscreen()) {
-    ToggleFullscreen();
-    return;
-  }
-
   // Get out of fullscreen when in fullscreen mode.
   if (ash::wm::IsWindowFullscreen(window)) {
     ToggleFullscreen();
     return;
   }
   ash::wm::ToggleMaximizedWindow(window);
 }
 
 void ChromeShellDelegate::RestoreTab() {
   if (tab_restore_helper_.get()) {
@@ skipping 231 matching lines @@
     return browser;
   return chrome::FindOrCreateTabbedBrowser(
       ProfileManager::GetDefaultProfileOrOffTheRecord(),
       chrome::HOST_DESKTOP_TYPE_ASH);
 }
 
 keyboard::KeyboardControllerProxy*
     ChromeShellDelegate::CreateKeyboardControllerProxy() {
   return new AshKeyboardControllerProxy();
 }