| Index: chrome/browser/ui/fullscreen_controller.cc
|
| ===================================================================
|
| --- chrome/browser/ui/fullscreen_controller.cc (revision 116109)
|
| +++ chrome/browser/ui/fullscreen_controller.cc (working copy)
|
| @@ -44,7 +44,7 @@
|
| TabContentsWrapper::GetCurrentWrapperForContents(tab);
|
| if (!wrapper || (wrapper != fullscreened_tab_))
|
| return false;
|
| - DCHECK(tab == browser_->GetSelectedTabContents());
|
| + DCHECK(tab == browser_->GetSelectedWebContents());
|
| DCHECK(window_->IsFullscreen());
|
| return true;
|
| }
|
| @@ -85,7 +85,7 @@
|
|
|
| void FullscreenController::ToggleFullscreenModeForTab(WebContents* tab,
|
| bool enter_fullscreen) {
|
| - if (tab != browser_->GetSelectedTabContents())
|
| + if (tab != browser_->GetSelectedWebContents())
|
| return;
|
|
|
| bool in_browser_or_tab_fullscreen_mode;
|
| @@ -139,7 +139,7 @@
|
| bool entering_fullscreen = !window_->InPresentationMode();
|
| GURL url;
|
| if (for_tab) {
|
| - url = browser_->GetSelectedTabContents()->GetURL();
|
| + url = browser_->GetSelectedWebContents()->GetURL();
|
| tab_fullscreen_accepted_ = entering_fullscreen &&
|
| GetFullscreenSetting(url) == CONTENT_SETTING_ALLOW;
|
| }
|
| @@ -165,7 +165,7 @@
|
|
|
| GURL url;
|
| if (for_tab) {
|
| - url = browser_->GetSelectedTabContents()->GetURL();
|
| + url = browser_->GetSelectedWebContents()->GetURL();
|
| tab_fullscreen_accepted_ = entering_fullscreen &&
|
| GetFullscreenSetting(url) == CONTENT_SETTING_ALLOW;
|
| } else {
|
|
|