Remove unneeded TabContents::FromWebContents.

chrome/browser/ui/fullscreen/fullscreen_controller.cc

Index: chrome/browser/ui/fullscreen/fullscreen_controller.cc
diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller.cc b/chrome/browser/ui/fullscreen/fullscreen_controller.cc
index bb8842fea2b40ae2f42b3bcb2900a4fe28625855..3d21e071126eae15c608e7d12f33a0392aafc67a 100644
--- a/chrome/browser/ui/fullscreen/fullscreen_controller.cc
+++ b/chrome/browser/ui/fullscreen/fullscreen_controller.cc
@@ -13,7 +13,6 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
@@ -63,9 +62,7 @@ bool FullscreenController::IsFullscreenForTabOrPending() const {
 
 bool FullscreenController::IsFullscreenForTabOrPending(
     const WebContents* web_contents) const {
-  const TabContents* tab_contents =
-      TabContents::FromWebContents(web_contents);
-  if (!tab_contents || (tab_contents != fullscreened_tab_))
+  if (web_contents != fullscreened_tab_)
     return false;
   DCHECK(web_contents == chrome::GetActiveWebContents(browser_));
   return true;
@@ -93,7 +90,7 @@ void FullscreenController::ToggleFullscreenModeForTab(WebContents* web_contents,
 #endif
 
   if (enter_fullscreen) {
-    SetFullscreenedTab(TabContents::FromWebContents(web_contents));
+    SetFullscreenedTab(web_contents);
     if (!in_browser_or_tab_fullscreen_mode) {
       tab_caused_fullscreen_ = true;
 #if defined(OS_MACOSX)
@@ -199,7 +196,7 @@ void FullscreenController::RequestToLockMouse(WebContents* web_contents,
     web_contents->GotResponseToLockMouseRequest(false);
     return;
   }
-  SetMouseLockTab(TabContents::FromWebContents(web_contents));
+  SetMouseLockTab(web_contents);
   FullscreenExitBubbleType bubble_type = GetFullscreenExitBubbleType();
 
   switch (GetMouseLockSetting(web_contents->GetURL())) {
@@ -237,17 +234,12 @@ void FullscreenController::RequestToLockMouse(WebContents* web_contents,
 }
 
 void FullscreenController::OnTabDeactivated(WebContents* web_contents) {
-  const TabContents* contents = TabContents::FromWebContents(web_contents);
-  if (contents &&
-      (contents == fullscreened_tab_ || contents == mouse_lock_tab_)) {
+  if (web_contents == fullscreened_tab_ || web_contents == mouse_lock_tab_)
     ExitTabFullscreenOrMouseLockIfNecessary();
-  }
 }
 
 void FullscreenController::OnTabClosing(WebContents* web_contents) {
-  const TabContents* contents = TabContents::FromWebContents(web_contents);
-  if (contents &&
-      (contents == fullscreened_tab_ || contents == mouse_lock_tab_)) {
+  if (web_contents == fullscreened_tab_ || web_contents == mouse_lock_tab_) {
     ExitTabFullscreenOrMouseLockIfNecessary();
     // The call to exit fullscreen may result in asynchronous notification of
     // fullscreen state change (e.g., on Linux). We don't want to rely on it
@@ -310,8 +302,7 @@ void FullscreenController::OnAcceptFullscreenPermission(
     }
 
     if (mouse_lock_tab_ &&
-        mouse_lock_tab_->web_contents() &&
-        mouse_lock_tab_->web_contents()->GotResponseToLockMouseRequest(true)) {
+        mouse_lock_tab_->GotResponseToLockMouseRequest(true)) {
       mouse_lock_state_ = MOUSELOCK_ACCEPTED;
     } else {
       mouse_lock_state_ = MOUSELOCK_NOT_REQUESTED;
@@ -346,8 +337,8 @@ void FullscreenController::OnDenyFullscreenPermission(
   if (mouse_lock) {
     DCHECK(IsMouseLockRequested());
     mouse_lock_state_ = MOUSELOCK_NOT_REQUESTED;
-    if (mouse_lock_tab_ && mouse_lock_tab_->web_contents())
-      mouse_lock_tab_->web_contents()->GotResponseToLockMouseRequest(false);
+    if (mouse_lock_tab_)
+      mouse_lock_tab_->GotResponseToLockMouseRequest(false);
     SetMouseLockTab(NULL);
     NotifyMouseLockChange();
 
@@ -437,12 +428,11 @@ void FullscreenController::UpdateNotificationRegistrations() {
   if (fullscreened_tab_ && mouse_lock_tab_)
     DCHECK(fullscreened_tab_ == mouse_lock_tab_);
 
-  TabContents* tab = fullscreened_tab_ ? fullscreened_tab_ : mouse_lock_tab_;
+  WebContents* tab = fullscreened_tab_ ? fullscreened_tab_ : mouse_lock_tab_;
 
   if (tab && registrar_.IsEmpty()) {
     registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-        content::Source<content::NavigationController>(
-            &tab->web_contents()->GetController()));
+        content::Source<content::NavigationController>(&tab->GetController()));
   } else if (!tab && !registrar_.IsEmpty()) {
     registrar_.RemoveAll();
   }
@@ -464,8 +454,7 @@ void FullscreenController::NotifyFullscreenChange(bool is_fullscreen) {
 
 void FullscreenController::NotifyTabOfExitIfNecessary() {
   if (fullscreened_tab_) {
-    RenderViewHost* rvh =
-        fullscreened_tab_->web_contents()->GetRenderViewHost();
+    RenderViewHost* rvh = fullscreened_tab_->GetRenderViewHost();
     SetFullscreenedTab(NULL);
     tab_caused_fullscreen_ = false;
     tab_fullscreen_accepted_ = false;
@@ -474,13 +463,12 @@ void FullscreenController::NotifyTabOfExitIfNecessary() {
   }
 
   if (mouse_lock_tab_) {
-    WebContents* web_contents = mouse_lock_tab_->web_contents();
     if (IsMouseLockRequested()) {
-      web_contents->GotResponseToLockMouseRequest(false);
+      mouse_lock_tab_->GotResponseToLockMouseRequest(false);
       NotifyMouseLockChange();
-    } else if (web_contents->GetRenderViewHost() &&
-               web_contents->GetRenderViewHost()->GetView()) {
-      web_contents->GetRenderViewHost()->GetView()->UnlockMouse();
+    } else if (mouse_lock_tab_->GetRenderViewHost() &&
+               mouse_lock_tab_->GetRenderViewHost()->GetView()) {
+      mouse_lock_tab_->GetRenderViewHost()->GetView()->UnlockMouse();
     }
     SetMouseLockTab(NULL);
     mouse_lock_state_ = MOUSELOCK_NOT_REQUESTED;
@@ -561,12 +549,12 @@ void FullscreenController::TogglePresentationModeInternal(bool for_tab) {
 }
 #endif
 
-void FullscreenController::SetFullscreenedTab(TabContents* tab) {
+void FullscreenController::SetFullscreenedTab(WebContents* tab) {
   fullscreened_tab_ = tab;
   UpdateNotificationRegistrations();
 }
 
-void FullscreenController::SetMouseLockTab(TabContents* tab) {
+void FullscreenController::SetMouseLockTab(WebContents* tab) {
   mouse_lock_tab_ = tab;
   UpdateNotificationRegistrations();
 }
@@ -581,9 +569,9 @@ void FullscreenController::ExitTabFullscreenOrMouseLockIfNecessary() {
 void FullscreenController::UpdateFullscreenExitBubbleContent() {
   GURL url;
   if (fullscreened_tab_)
-    url = fullscreened_tab_->web_contents()->GetURL();
+    url = fullscreened_tab_->GetURL();
   else if (mouse_lock_tab_)
-    url = mouse_lock_tab_->web_contents()->GetURL();
+    url = mouse_lock_tab_->GetURL();
   else if (!extension_caused_fullscreen_.is_empty())
     url = extension_caused_fullscreen_;
 
@@ -592,18 +580,17 @@ void FullscreenController::UpdateFullscreenExitBubbleContent() {
   // If bubble displays buttons, unlock mouse to allow pressing them.
   if (fullscreen_bubble::ShowButtonsForType(bubble_type) &&
       IsMouseLocked() &&
-      mouse_lock_tab_->web_contents()) {
-    WebContents* web_contents = mouse_lock_tab_->web_contents();
-    if (web_contents && web_contents->GetRenderViewHost() &&
-        web_contents->GetRenderViewHost()->GetView())
-      web_contents->GetRenderViewHost()->GetView()->UnlockMouse();
+      mouse_lock_tab_ &&
+      mouse_lock_tab_->GetRenderViewHost() &&
+      mouse_lock_tab_->GetRenderViewHost()->GetView()) {
+    mouse_lock_tab_->GetRenderViewHost()->GetView()->UnlockMouse();
   }
 
   window_->UpdateFullscreenExitBubbleContent(url, bubble_type);
 }
 
 ContentSetting
-    FullscreenController::GetFullscreenSetting(const GURL& url) const {
+FullscreenController::GetFullscreenSetting(const GURL& url) const {
   if (url.SchemeIsFile())
     return CONTENT_SETTING_ALLOW;
 
@@ -612,7 +599,7 @@ ContentSetting
 }
 
 ContentSetting
-    FullscreenController::GetMouseLockSetting(const GURL& url) const {
+FullscreenController::GetMouseLockSetting(const GURL& url) const {
   if (url.SchemeIsFile())
     return CONTENT_SETTING_ALLOW;