Add flag to enable immersive fullscreen for v2 apps

apps/shell_window.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 "apps/shell_window.h"
 
 #include "apps/shell_window_geometry_cache.h"
 #include "apps/shell_window_registry.h"
 #include "apps/ui/native_app_window.h"
 #include "base/command_line.h"
@@ skipping 123 matching lines @@
 
 ShellWindow::ShellWindow(Profile* profile,
                          Delegate* delegate,
                          const extensions::Extension* extension)
     : profile_(profile),
       extension_(extension),
       extension_id_(extension->id()),
       window_type_(WINDOW_TYPE_DEFAULT),
       delegate_(delegate),
       image_loader_ptr_factory_(this),
-      fullscreen_for_window_api_(false),
-      fullscreen_for_tab_(false),
+      fullscreen_types_(FULLSCREEN_TYPE_NONE),
       show_on_first_paint_(false),
       first_paint_complete_(false) {
 }
 
 void ShellWindow::Init(const GURL& url,
                        ShellWindowContents* shell_window_contents,
                        const CreateParams& params) {
   // Initialize the render interface and web contents
   shell_window_contents_.reset(shell_window_contents);
   shell_window_contents_->Initialize(profile(), url);
@@ skipping 241 matching lines @@
   native_app_window_->UpdateWindowIcon();
   ShellWindowRegistry::Get(profile_)->ShellWindowIconChanged(this);
 }
 
 void ShellWindow::Fullscreen() {
 #if !defined(OS_MACOSX)
   // Do not enter fullscreen mode if disallowed by pref.
   if (!profile()->GetPrefs()->GetBoolean(prefs::kAppFullscreenAllowed))
     return;
 #endif
-  fullscreen_for_window_api_ = true;
-  GetBaseWindow()->SetFullscreen(true);
+  fullscreen_types_ |= FULLSCREEN_TYPE_WINDOW_API;
+  GetBaseWindow()->SetFullscreen(fullscreen_types_);
 }
 
 void ShellWindow::Maximize() {
   GetBaseWindow()->Maximize();
 }
 
 void ShellWindow::Minimize() {
   GetBaseWindow()->Minimize();
 }
 
 void ShellWindow::Restore() {
-  fullscreen_for_window_api_ = false;
-  fullscreen_for_tab_ = false;
-  if (GetBaseWindow()->IsFullscreenOrPending()) {
-    GetBaseWindow()->SetFullscreen(false);
+  if (fullscreen_types_ != FULLSCREEN_TYPE_NONE) {
+    fullscreen_types_ = FULLSCREEN_TYPE_NONE;

[benwells, 2013/11/14 00:06:54]

Is there a logical change here? It was checking IsFullscreenOrPending before.

[pkotwicz, 2013/11/14 01:05:24]

This is not a logical change as far as I can tell. (It better not be a logical
change given that IsFullscreenForTabOrPending() checks |fullscreen_types_|)

+    GetBaseWindow()->SetFullscreen(fullscreen_types_);
   } else {
     GetBaseWindow()->Restore();
   }
 }
 
+void ShellWindow::OSFullscreen() {
+#if !defined(OS_MACOSX)
+  // Do not enter fullscreen mode if disallowed by pref.
+  if (!profile()->GetPrefs()->GetBoolean(prefs::kAppFullscreenAllowed))
+    return;
+#endif
+  fullscreen_types_ |= FULLSCREEN_TYPE_OS;
+  GetBaseWindow()->SetFullscreen(fullscreen_types_);
+}
+
 void ShellWindow::SetMinimumSize(const gfx::Size& min_size) {
   size_constraints_.set_minimum_size(min_size);
   OnSizeConstraintsChanged();
 }
 
 void ShellWindow::SetMaximumSize(const gfx::Size& max_size) {
   size_constraints_.set_maximum_size(max_size);
   OnSizeConstraintsChanged();
 }
 
@@ skipping 139 matching lines @@
   }
 #endif
 
   if (!IsExtensionWithPermissionOrSuggestInConsole(
       APIPermission::kFullscreen,
       extension_,
       source->GetRenderViewHost())) {
     return;
   }
 
-  fullscreen_for_tab_ = enter_fullscreen;
-
-  if (enter_fullscreen) {
-    native_app_window_->SetFullscreen(true);
-  } else if (!fullscreen_for_window_api_) {
-    native_app_window_->SetFullscreen(false);
-  }
+  if (enter_fullscreen)
+    fullscreen_types_ |= FULLSCREEN_TYPE_HTML_API;
+  else
+    fullscreen_types_ ^= FULLSCREEN_TYPE_HTML_API;
+  GetBaseWindow()->SetFullscreen(fullscreen_types_);
 }
 
 bool ShellWindow::IsFullscreenForTabOrPending(
     const content::WebContents* source) const {
-  return fullscreen_for_tab_;
+  return (fullscreen_types_ & FULLSCREEN_TYPE_HTML_API);
 }
 
 void ShellWindow::Observe(int type,
                           const content::NotificationSource& source,
                           const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_EXTENSION_UNLOADED: {
       const extensions::Extension* unloaded_extension =
           content::Details<extensions::UnloadedExtensionInfo>(
               details)->extension;
@@ skipping 139 matching lines @@
         region.bounds.x(),
         region.bounds.y(),
         region.bounds.right(),
         region.bounds.bottom(),
         region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op);
   }
   return sk_region;
 }
 
 }  // namespace apps