Remove --disable-fullscreen-within-tab command-line flag.

chrome/browser/ui/fullscreen/fullscreen_controller.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/fullscreen/fullscreen_controller.h"
 
 #include "apps/ui/web_contents_sizer.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 67 matching lines @@
 }
 
 bool FullscreenController::IsWindowFullscreenForTabOrPending() const {
   return fullscreened_tab_ != NULL;
 }
 
 bool FullscreenController::IsFullscreenForTabOrPending(
     const WebContents* web_contents) const {
   if (web_contents == fullscreened_tab_) {
     DCHECK(web_contents == browser_->tab_strip_model()->GetActiveWebContents());
-    DCHECK(!IsFullscreenWithinTabPossible() ||
-           web_contents->GetCapturerCount() == 0);
+    DCHECK(web_contents->GetCapturerCount() == 0);
     return true;
   }
   return IsFullscreenForCapturedTab(web_contents);
 }
 
 bool FullscreenController::IsFullscreenCausedByTab() const {
   return state_prior_to_tab_fullscreen_ == STATE_NORMAL;
 }
 
 void FullscreenController::ToggleFullscreenModeForTab(WebContents* web_contents,
@@ skipping 604 matching lines @@
     return CONTENT_SETTING_ALLOW;
 
   HostContentSettingsMap* settings_map = profile_->GetHostContentSettingsMap();
   return settings_map->GetContentSetting(url, url,
       CONTENT_SETTINGS_TYPE_MOUSELOCK, std::string());
 }
 
 bool FullscreenController::IsPrivilegedFullscreenForTab() const {
   const bool embedded_widget_present =
       fullscreened_tab_ &&
-      fullscreened_tab_->GetFullscreenRenderWidgetHostView() &&
-      IsFullscreenWithinTabPossible();
+      fullscreened_tab_->GetFullscreenRenderWidgetHostView();
   return embedded_widget_present || is_privileged_fullscreen_for_testing_;
 }
 
 void FullscreenController::SetPrivilegedFullscreenForTesting(
     bool is_privileged) {
   is_privileged_fullscreen_for_testing_ = is_privileged;
 }
 
-bool FullscreenController::IsFullscreenWithinTabPossible() const {
-  return implicit_cast<const content::WebContentsDelegate*>(browser_)->
-      EmbedsFullscreenWidget();
-}
-
 bool FullscreenController::MaybeToggleFullscreenForCapturedTab(
     WebContents* web_contents, bool enter_fullscreen) {
-  if (!IsFullscreenWithinTabPossible())
-    return false;
-
   if (enter_fullscreen) {
     if (web_contents->GetCapturerCount() > 0) {
       FullscreenWithinTabHelper::CreateForWebContents(web_contents);
       FullscreenWithinTabHelper::FromWebContents(web_contents)->
           SetIsFullscreenForCapturedTab(true);
       return true;
     }
   } else {
     if (IsFullscreenForCapturedTab(web_contents)) {
       FullscreenWithinTabHelper::RemoveForWebContents(web_contents);
       return true;
     }
   }
 
   return false;
 }
 
 bool FullscreenController::IsFullscreenForCapturedTab(
     const WebContents* web_contents) const {
   // Note: On Mac, some of the OnTabXXX() methods get called with a NULL value
   // for web_contents. Check for that here.
   const FullscreenWithinTabHelper* const helper = web_contents ?
       FullscreenWithinTabHelper::FromWebContents(web_contents) : NULL;
   if (helper && helper->is_fullscreen_for_captured_tab()) {
-    DCHECK(IsFullscreenWithinTabPossible());
     DCHECK_NE(fullscreened_tab_, web_contents);
     return true;
   }
   return false;
 }
 
 void FullscreenController::UnlockMouse() {
   if (!mouse_lock_tab_)
     return;
   content::RenderWidgetHostView* mouse_lock_view =
       (fullscreened_tab_ == mouse_lock_tab_ && IsPrivilegedFullscreenForTab()) ?
       mouse_lock_tab_->GetFullscreenRenderWidgetHostView() : NULL;
   if (!mouse_lock_view) {
     RenderViewHost* const rvh = mouse_lock_tab_->GetRenderViewHost();
     if (rvh)
       mouse_lock_view = rvh->GetView();
   }
   if (mouse_lock_view)
     mouse_lock_view->UnlockMouse();
 }