Introduce WindowStateDelegate::ToggleFullscreen

chrome/browser/ui/views/apps/native_app_window_views.cc

 // Copyright 2013 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/views/apps/native_app_window_views.h"
 
+#include "apps/shell_window.h"
+#include "apps/shell_window_registry.h"
 #include "apps/ui/views/shell_window_frame_view.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "extensions/common/draggable_region.h"
@@ skipping 13 matching lines @@
 #include "chrome/browser/shell_integration_linux.h"
 #endif
 
 #if defined(USE_ASH)
 #include "ash/ash_constants.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/wm/custom_frame_view_ash.h"
 #include "ash/wm/panels/panel_frame_view.h"
 #include "ash/wm/window_state.h"
+#include "ash/wm/window_state_delegate.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/window.h"
 #endif
 
 using apps::ShellWindow;
 
 namespace {
 
@@ skipping 54 matching lines @@
 
   if (!base::PathExists(web_app_path) &&
       !file_util::CreateDirectory(web_app_path)) {
     return;
   }
   ui::win::SetAppIconForWindow(icon_file.value(), hwnd);
   web_app::internals::CheckAndSaveIcon(icon_file, shortcut_info.favicon);
 }
 #endif
 
+#if defined(USE_ASH)
+class NativeAppWindowStateDelegate : public ash::wm::WindowStateDelegate {
+ public:
+  NativeAppWindowStateDelegate(ShellWindow* shell_window)
+      : shell_window_(shell_window) {
+    DCHECK(shell_window_);
+  }
+  virtual ~NativeAppWindowStateDelegate(){}
+
+  virtual bool ToggleFullscreen(ash::wm::WindowState* window_state) OVERRIDE {
+    bool is_fullscreen = window_state->IsFullscreen();
+
+    DCHECK_EQ(

[pkotwicz, 2013/10/29 00:46:01]

Nit: remove the DCHECK

[oshima, 2013/10/29 02:05:42]

Done.

+        apps::ShellWindowRegistry::GetShellWindowForNativeWindowAnyProfile(
+            window_state->window()),
+        shell_window_);
+
+    // Windows which cannot be maximized should not be fullscreened.
+    if (is_fullscreen || window_state->CanMaximize()) {

[pkotwicz, 2013/10/29 00:46:01]

I personally think that testing CanMaximize() here is redundant. But I do not
feel very strongly on this point

If you do keep the check for CanMaximize(), I would rather do this:
if (is_fullscreen) {
  shell_window_->Restore();
} else {
  if (window_state->CanMaximize())
    shell_window_->Fullscreen();
}

[oshima, 2013/10/29 02:05:42]

Done.

+      if (is_fullscreen)
+        shell_window_->Restore();
+      else
+        shell_window_->Fullscreen();
+    }
+    return true;
+  }
+
+ private:
+  ShellWindow* shell_window_;  // not owned.
+
+  DISALLOW_COPY_AND_ASSIGN(NativeAppWindowStateDelegate);
+};
+#endif  // USE_ASH
+
 }  // namespace
 
 NativeAppWindowViews::NativeAppWindowViews(
     ShellWindow* shell_window,
     const ShellWindow::CreateParams& create_params)
     : shell_window_(shell_window),
       web_view_(NULL),
       window_(NULL),
       is_fullscreen_(false),
       frameless_(create_params.frame == ShellWindow::FRAME_NONE),
@@ skipping 11 matching lines @@
   }
   extension_keybinding_registry_.reset(
       new ExtensionKeybindingRegistryViews(
           profile(),
           window_->GetFocusManager(),
           extensions::ExtensionKeybindingRegistry::PLATFORM_APPS_ONLY,
           shell_window_));
 
   OnViewWasResized();
   window_->AddObserver(this);
+#if defined(USE_ASH)
+  if (chrome::GetHostDesktopTypeForNativeView(GetNativeWindow()) ==
+      chrome::HOST_DESKTOP_TYPE_ASH) {
+    ash::wm::GetWindowState(GetNativeWindow())->SetDelegate(
+        new NativeAppWindowStateDelegate(shell_window));
+  }
+#endif
 }
 
 NativeAppWindowViews::~NativeAppWindowViews() {
   web_view_->SetWebContents(NULL);
 }
 
 void NativeAppWindowViews::InitializeDefaultWindow(
     const ShellWindow::CreateParams& create_params) {
   std::string app_name =
       web_app::GenerateApplicationNameFromExtensionId(extension()->id());
@@ skipping 667 matching lines @@
   return window_bounds.InsetsFrom(client_bounds);
 }
 
 bool NativeAppWindowViews::IsVisible() const {
   return window_->IsVisible();
 }
 
 void NativeAppWindowViews::HideWithApp() {}
 void NativeAppWindowViews::ShowWithApp() {}
 void NativeAppWindowViews::UpdateWindowMinMaxSize() {}