Introduce WindowStateDelegate::ToggleFullscreen

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/shell_window.h"
 #include "apps/shell_window_registry.h"
 #include "apps/ui/native_app_window.h"
 #include "ash/host/root_window_host_factory.h"
@@ skipping 133 matching lines @@
     browser->window()->Show();
 }
 
 void ChromeShellDelegate::NewWindow(bool is_incognito) {
   Profile* profile = ProfileManager::GetDefaultProfileOrOffTheRecord();
   chrome::NewEmptyWindow(
       is_incognito ? profile->GetOffTheRecordProfile() : profile,
       chrome::HOST_DESKTOP_TYPE_ASH);
 }
 
+#if 0
 void ChromeShellDelegate::ToggleFullscreen() {
   // 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);
 
   bool is_fullscreen = window_state->IsFullscreen();
 
   // Windows which cannot be maximized should not be fullscreened.
   if (!is_fullscreen && !window_state->CanMaximize())
     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
-    // 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) {
-      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);
+    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)
       shell_window->Restore();
     else
       shell_window->Fullscreen();
   }
 }
+#endif
 
 void ChromeShellDelegate::RestoreTab() {
   if (tab_restore_helper_.get()) {
     DCHECK(!tab_restore_helper_->tab_restore_service()->IsLoaded());
     return;
   }
 
   Browser* browser = chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow());
   Profile* profile = browser ? browser->profile() : NULL;
   if (!profile)
@@ skipping 233 matching lines @@
 }
 
 Browser* ChromeShellDelegate::GetTargetBrowserIfAvailable() {
   return chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow());
 }
 
 keyboard::KeyboardControllerProxy*
     ChromeShellDelegate::CreateKeyboardControllerProxy() {
   return new AshKeyboardControllerProxy();
 }