Make packaged apps use AppNonClientFrameViewAsh when maximized

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 "apps/native_app_window.h"
 #include "apps/shell_window.h"
 #include "apps/shell_window_registry.h"
+#include "ash/ash_switches.h"
 #include "ash/host/root_window_host_factory.h"
 #include "ash/magnifier/magnifier_constants.h"
 #include "ash/session_state_delegate.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/sessions/tab_restore_service_observer.h"
 #include "chrome/browser/ui/app_list/app_list_view_delegate.h"
 #include "chrome/browser/ui/ash/app_list/app_list_controller_ash.h"
 #include "chrome/browser/ui/ash/ash_keyboard_controller_proxy.h"
+#include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
 #include "chrome/browser/ui/ash/user_action_handler.h"
 #include "chrome/browser/ui/ash/window_positioner.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 131 matching lines @@
     return;
 
   Browser* browser = chrome::FindBrowserWithWindow(window);
   if (browser) {
     // If a window is fullscreen, exit fullscreen.
     if (is_fullscreen) {
       chrome::ToggleFullscreenMode(browser);
       return;
     }
 
-    // AppNonClientFrameViewAsh shows only the window controls and no other
+    // AppBrowserFrameViewAsh 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.
-#if defined(OS_WIN)
-    if (browser->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_NATIVE) {
+    if (chrome::IsNativeViewInAsh(window) &&
+        browser->is_app() &&
+        browser->app_type() != Browser::APP_TYPE_CHILD) {
+      window_state->ToggleMaximized();
+    } else {
       chrome::ToggleFullscreenMode(browser);
-      return;
     }
-#endif  // OS_WIN
-    if (browser->is_app() && browser->app_type() != Browser::APP_TYPE_CHILD)
-      window_state->ToggleMaximized();
-    else
-      chrome::ToggleFullscreenMode(browser);
     return;
   }
 
   // |window| may belong to a shell window.
   apps::ShellWindow* shell_window = apps::ShellWindowRegistry::
       GetShellWindowForNativeWindowAnyProfile(window);
   if (shell_window) {
-    if (is_fullscreen)
+    if (is_fullscreen) {
       shell_window->Restore();
-    else
+    } else if (chrome::IsNativeViewInAsh(window) &&
+               ash::switches::UseSameFrameForV1AndV2Apps()) {
+      // AppNonClientFrameViewAsh shows only the window controls and no other
+      // window decorations which is close to fullscreen and is more useful than
+      // fullscreen. Put shell windows into maximized mode instead of
+      // fullscreen.
+      shell_window->Maximize();
+    } else {
       shell_window->Fullscreen();
+    }
   }
 }
 
 void ChromeShellDelegate::ToggleMaximized() {
   // Only toggle if the user has a window open.
   aura::Window* window = ash::wm::GetActiveWindow();
   if (!window)
     return;
 
   ash::wm::WindowState* window_state = ash::wm::GetWindowState(window);
@@ skipping 245 matching lines @@
 }
 
 Browser* ChromeShellDelegate::GetTargetBrowserIfAvailable() {
   return chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow());
 }
 
 keyboard::KeyboardControllerProxy*
     ChromeShellDelegate::CreateKeyboardControllerProxy() {
   return new AshKeyboardControllerProxy();
 }