Enable fullscreening an app window using Shift+F4

BUG=229213
TEST=Manual, see bug
R=jamescook
TBR=sky (for change in chrome/browser/ui/views/accelerator_table.cc)

Review URL: https://chromiumcodereview.appspot.com/14389004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196096 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 56 insertions, 9 deletions

diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc
index 9daa8b1..a3f4c5b 100644
--- a/ash/accelerators/accelerator_table.cc
+++ b/ash/accelerators/accelerator_table.cc
@@ -124,6 +124,7 @@ const AcceleratorData kAcceleratorData[] = {
   { false, ui::VKEY_LWIN, ui::EF_NONE, TOGGLE_APP_LIST },
   { false, ui::VKEY_LWIN, ui::EF_ALT_DOWN, TOGGLE_CAPS_LOCK },
   { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_NONE, TOGGLE_MAXIMIZED },
+  { true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_SHIFT_DOWN, TOGGLE_FULLSCREEN },
   { true, ui::VKEY_VOLUME_MUTE, ui::EF_NONE, VOLUME_MUTE },
   { true, ui::VKEY_VOLUME_DOWN, ui::EF_NONE, VOLUME_DOWN },
   { true, ui::VKEY_VOLUME_UP, ui::EF_NONE, VOLUME_UP },
@@ -313,6 +314,7 @@ const AcceleratorAction kNonrepeatableActions[] = {
   SCALE_UI_UP,
   SCALE_UI_DOWN,
   SCALE_UI_RESET,
+  TOGGLE_FULLSCREEN,
   TOGGLE_MAXIMIZED,
   WINDOW_MINIMIZE,
 };
diff --git a/ash/accelerators/accelerator_table.h b/ash/accelerators/accelerator_table.h
index b28e4e9..361f314 100644
--- a/ash/accelerators/accelerator_table.h
+++ b/ash/accelerators/accelerator_table.h
@@ -73,6 +73,7 @@ enum AcceleratorAction {
   TOGGLE_CAPS_LOCK,
   TOGGLE_CAPS_LOCK_BY_ALT_LWIN,
   TOGGLE_DESKTOP_BACKGROUND_MODE,
+  TOGGLE_FULLSCREEN,
   TOGGLE_MAXIMIZED,
   TOGGLE_ROOT_WINDOW_FULL_SCREEN,
   TOGGLE_SPOKEN_FEEDBACK,
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc
index 264363d..25d092a 100644
--- a/ash/shell/shell_delegate_impl.cc
+++ b/ash/shell/shell_delegate_impl.cc
@@ -97,6 +97,10 @@ void ShellDelegateImpl::NewWindow(bool incognito) {
   ash::shell::ToplevelWindow::CreateToplevelWindow(create_params);
 }
 
+void ShellDelegateImpl::ToggleFullscreen() {
+  ToggleMaximized();
+}
+
 void ShellDelegateImpl::ToggleMaximized() {
   aura::Window* window = ash::wm::GetActiveWindow();
   if (window)
diff --git a/ash/shell/shell_delegate_impl.h b/ash/shell/shell_delegate_impl.h
index 81d5228..ddd6b95 100644
--- a/ash/shell/shell_delegate_impl.h
+++ b/ash/shell/shell_delegate_impl.h
@@ -35,6 +35,7 @@ class ShellDelegateImpl : public ash::ShellDelegate {
   virtual void Exit() OVERRIDE;
   virtual void NewTab() OVERRIDE;
   virtual void NewWindow(bool incognito) OVERRIDE;
+  virtual void ToggleFullscreen() OVERRIDE;
   virtual void ToggleMaximized() OVERRIDE;
   virtual void OpenFileManager(bool as_dialog) OVERRIDE;
   virtual void OpenCrosh() OVERRIDE;
diff --git a/ash/shell_delegate.h b/ash/shell_delegate.h
index 0ff5fe6..c561bf1 100644
--- a/ash/shell_delegate.h
+++ b/ash/shell_delegate.h
@@ -55,6 +55,7 @@ enum UserMetricsAction {
   UMA_ACCEL_LOCK_SCREEN_L,
   UMA_ACCEL_LOCK_SCREEN_LOCK_BUTTON,
   UMA_ACCEL_LOCK_SCREEN_POWER_BUTTON,
+  UMA_ACCEL_FULLSCREEN_F4,
   UMA_ACCEL_MAXIMIZE_RESTORE_F4,
   UMA_ACCEL_NEWTAB_T,
   UMA_ACCEL_NEXTWINDOW_F5,
@@ -126,6 +127,9 @@ class ASH_EXPORT ShellDelegate {
   // Invoked when the user uses Ctrl-N or Ctrl-Shift-N to open a new window.
   virtual void NewWindow(bool incognito) = 0;
 
+  // Invoked when the user uses Shift+F4 to toggle the window fullscreen state.
+  virtual void ToggleFullscreen() = 0;
+
   // Invoked when the user uses F4 to toggle window maximized state.
   virtual void ToggleMaximized() = 0;
 
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
index 8013d08..17792c7 100644
--- a/ash/test/test_shell_delegate.cc
+++ b/ash/test/test_shell_delegate.cc
@@ -67,6 +67,9 @@ void TestShellDelegate::ToggleMaximized() {
     ash::wm::ToggleMaximizedWindow(window);
 }
 
+void TestShellDelegate::ToggleFullscreen() {
+}
+
 void TestShellDelegate::OpenFileManager(bool as_dialog) {
 }
 
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index 6c95ea8..04f2997 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -34,6 +34,7 @@ class TestShellDelegate : public ShellDelegate {
   virtual void Exit() OVERRIDE;
   virtual void NewTab() OVERRIDE;
   virtual void NewWindow(bool incognito) OVERRIDE;
+  virtual void ToggleFullscreen() OVERRIDE;
   virtual void ToggleMaximized() OVERRIDE;
   virtual void OpenFileManager(bool as_dialog) OVERRIDE;
   virtual void OpenCrosh() OVERRIDE;
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc
index 9384f16..d6de758 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc
@@ -18,6 +18,7 @@
 #include "base/prefs/pref_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
+#include "chrome/browser/extensions/shell_window_registry.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
@@ -34,6 +35,8 @@
 #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/extensions/native_app_window.h"
+#include "chrome/browser/ui/extensions/shell_window.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
 #include "chrome/common/chrome_notification_types.h"
@@ -92,22 +95,51 @@ void ChromeShellDelegate::NewWindow(bool is_incognito) {
       chrome::HOST_DESKTOP_TYPE_ASH);
 }
 
+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))
+    return;
+
+  Browser* browser = chrome::FindBrowserWithWindow(window);
+  if (browser) {
+    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();
+  }
+}
+
 void ChromeShellDelegate::ToggleMaximized() {
   // Only toggle if the user has a window open.
   aura::Window* window = ash::wm::GetActiveWindow();
   if (!window)
     return;
 
-  // TODO(jamescook): If immersive mode replaces fullscreen, rename this
-  // function and the interface to ToggleFullscreen.
+  // TODO(pkotwicz): If immersive mode replaces fullscreen, bind fullscreen to
+  // F4 and find a different key binding for maximize.
   if (chrome::UseImmersiveFullscreen()) {
-    chrome::ToggleFullscreenMode(GetTargetBrowser());
+    ToggleFullscreen();
     return;
   }
 
   // Get out of fullscreen when in fullscreen mode.
   if (ash::wm::IsWindowFullscreen(window)) {
-    chrome::ToggleFullscreenMode(GetTargetBrowser());
+    ToggleFullscreen();
     return;
   }
   ash::wm::ToggleMaximizedWindow(window);
@@ -220,6 +252,9 @@ void ChromeShellDelegate::RecordUserMetricsAction(
       content::RecordAction(
           content::UserMetricsAction("Accel_LockScreen_PowerButton"));
       break;
+    case ash::UMA_ACCEL_FULLSCREEN_F4:
+      content::RecordAction(content::UserMetricsAction("Accel_Fullscreen_F4"));
+      break;
     case ash::UMA_ACCEL_MAXIMIZE_RESTORE_F4:
       content::RecordAction(
           content::UserMetricsAction("Accel_Maximize_Restore_F4"));
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.h b/chrome/browser/ui/ash/chrome_shell_delegate.h
index 4158f21..7357130 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate.h
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.h
@@ -55,6 +55,7 @@ class ChromeShellDelegate : public ash::ShellDelegate,
   virtual void Exit() OVERRIDE;
   virtual void NewTab() OVERRIDE;
   virtual void NewWindow(bool is_incognito) OVERRIDE;
+  virtual void ToggleFullscreen() OVERRIDE;
   virtual void ToggleMaximized() OVERRIDE;
   virtual void OpenFileManager(bool as_dialog) OVERRIDE;
   virtual void OpenCrosh() OVERRIDE;
diff --git a/chrome/browser/ui/views/accelerator_table.cc b/chrome/browser/ui/views/accelerator_table.cc
index 090264d..a8b416c 100644
--- a/chrome/browser/ui/views/accelerator_table.cc
+++ b/chrome/browser/ui/views/accelerator_table.cc
@@ -114,7 +114,6 @@ const AcceleratorMapping kAcceleratorMap[] = {
   { ui::VKEY_BACK, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
     IDC_CLEAR_BROWSING_DATA },
   { ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD },
-  { ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_SHIFT_DOWN, IDC_FULLSCREEN },
   { ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN, IDC_HELP_PAGE_VIA_KEYBOARD },
   { ui::VKEY_OEM_2, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
     IDC_HELP_PAGE_VIA_KEYBOARD },
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 1e3749b..02871de 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -2505,10 +2505,6 @@ void BrowserView::UpdateAcceleratorMetrics(
       else if (key_code == ui::VKEY_BROWSER_REFRESH)
         content::RecordAction(UserMetricsAction("Accel_Reload_F3"));
       break;
-    case IDC_FULLSCREEN:
-      if (key_code == ui::VKEY_MEDIA_LAUNCH_APP2)
-        content::RecordAction(UserMetricsAction("Accel_Fullscreen_F4"));
-      break;
     case IDC_FOCUS_LOCATION:
       if (key_code == ui::VKEY_D)
         content::RecordAction(UserMetricsAction("Accel_FocusLocation_D"));