Add flag to enable immersive fullscreen for v2 apps

apps/shell_window.h

 // 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.
 
 #ifndef APPS_SHELL_WINDOW_H_
 #define APPS_SHELL_WINDOW_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/extensions/extension_icon_image.h"
@@ skipping 74 matching lines @@
     WINDOW_TYPE_PANEL    = 1 << 1,  // OS controlled panel window (Ash only).
     WINDOW_TYPE_V1_PANEL = 1 << 2,  // For apps v1 support in Ash; deprecate
                                     // with v1 apps.
   };
 
   enum Frame {
     FRAME_CHROME,  // Chrome-style window frame.
     FRAME_NONE,  // Frameless window.
   };
 
+  enum FullscreenType {
+    // Normal fullscreen. Primarily used by the app.window api. The window takes
+    // up the entire screen and the window header (title bar and window
+    // controls) is hidden.
+    FULLSCREEN_TYPE_WINDOW,

[pkotwicz, 2013/11/13 00:10:13]

I suspect that we want to use this type of fullscreen for "MacOS Lion
Fullscreen"

[benwells, 2013/11/13 07:41:27]

Can we call this FULLSCREEN_TYPE_WINDOW_API? or FULLSCREEN_TYPE_CHROME_API, or
FULLSCREEN_TYPE_CHROME?

Why would we use this for Mac OS X full screen? That feels more analogous to
FULLSCREEN_TYPE_IMMERSIVE, which might be better named FULLSCREEN_TYPE_OS.

+
+    // Fullscreen entered by HTML requestFullscreen(). The HTML element on which
+    // requestFullscreen() was called takes up the entire screen and the widnow
+    // header is hidden.
+    FULLSCREEN_TYPE_TAB,

[benwells, 2013/11/13 07:41:27]

This would also be better as FULLSCREEN_TYPE_HTML_API, I think, or just
FULLSCREEN_TYPE_HTML.

+
+    // Combination of "window" fullscreen and fullscreen entered by HTML
+    // requestFullscreen().
+    FULLSCREEN_TYPE_WINDOW_AND_TAB,
+
+    // Fullscreen entered by hitting <F4> on ChromeOS. The window header slides
+    // onscreen as an overlay when the mouse is hovered at the top of the
+    // screen.
+    FULLSCREEN_TYPE_IMMERSIVE,
+
+    // Not fullscreen.
+    FULLSCREEN_TYPE_NONE
+  };
+
   class SizeConstraints {
    public:
     // The value SizeConstraints uses to represent an unbounded width or height.
     // This is an enum so that it can be declared inline here.
     enum { kUnboundedSize = 0 };
 
     SizeConstraints();
     SizeConstraints(const gfx::Size& min_size, const gfx::Size& max_size);
     ~SizeConstraints();
 
@@ skipping 172 matching lines @@
   // callback. Also called externally for v1 apps using Ash Panels.
   void UpdateAppIcon(const gfx::Image& image);
 
   // Transitions window into fullscreen, maximized, minimized or restores based
   // on chrome.app.window API.
   void Fullscreen();
   void Maximize();
   void Minimize();
   void Restore();
 
+  // Transitions into immersive fullscreen if immersive fullscreen is supported
+  // and to "window" fullscreen otherwise. See FULLSCREEN_TYPE_IMMERSIVE for
+  // more details.
+  void ImmersiveFullscreen();
+
   // Set the minimum and maximum size that this window is allowed to be.
   void SetMinimumSize(const gfx::Size& min_size);
   void SetMaximumSize(const gfx::Size& max_size);
 
   enum ShowType {
     SHOW_ACTIVE,
     SHOW_INACTIVE
   };
 
   // Shows the window if its contents have been painted; otherwise flags the
   // window to be shown as soon as its contents are painted for the first time.
   void Show(ShowType show_type);
 
   // Hides the window. If the window was previously flagged to be shown on
   // first paint, it will be unflagged.
   void Hide();
 
   ShellWindowContents* shell_window_contents_for_test() {
     return shell_window_contents_.get();
   }
 
+  // Get the fullscreen type.
+  FullscreenType fullscreen_type() const {
+    return fullscreen_type_;
+  }
+
   // Get the size constraints.
   const SizeConstraints& size_constraints() const {
     return size_constraints_;
   }
 
  protected:
   virtual ~ShellWindow();
 
  private:
   // PlatformAppBrowserTest needs access to web_contents()
@@ skipping 119 matching lines @@
 
   // An object to load the app's icon as an extension resource.
   scoped_ptr<extensions::IconImage> app_icon_image_;
 
   scoped_ptr<NativeAppWindow> native_app_window_;
   scoped_ptr<ShellWindowContents> shell_window_contents_;
   scoped_ptr<Delegate> delegate_;
 
   base::WeakPtrFactory<ShellWindow> image_loader_ptr_factory_;
 
-  // Fullscreen entered by app.window api.
-  bool fullscreen_for_window_api_;
-  // Fullscreen entered by HTML requestFullscreen.
-  bool fullscreen_for_tab_;
+  // The fullscreen type.
+  FullscreenType fullscreen_type_;
 
   // Size constraints on the window.
   SizeConstraints size_constraints_;
 
   // Show has been called, so the window should be shown once the first visually
   // non-empty paint occurs.
   bool show_on_first_paint_;
 
   // The first visually non-empty paint has completed.
   bool first_paint_complete_;
 
   // Whether the delayed Show() call was for an active or inactive window.
   ShowType delayed_show_type_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellWindow);
 };
 
 }  // namespace apps
 
 #endif  // APPS_SHELL_WINDOW_H_