Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2940)

Unified Diff: chrome/browser/ui/fullscreen_controller.cc

Issue 10702029: Move tab functions off Browser into browser_tabstrip and browser_tabrestore. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/fullscreen_controller.cc
===================================================================
--- chrome/browser/ui/fullscreen_controller.cc (revision 144967)
+++ chrome/browser/ui/fullscreen_controller.cc (working copy)
@@ -11,6 +11,7 @@
#include "chrome/browser/download/download_shelf.h"
#include "chrome/browser/profiles/profile.h"
#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"
@@ -72,7 +73,7 @@
TabContents::FromWebContents(web_contents);
if (!tab_contents || (tab_contents != fullscreened_tab_))
return false;
- DCHECK(web_contents == browser_->GetActiveWebContents());
+ DCHECK(web_contents == chrome::GetActiveWebContents(browser_));
return true;
}
@@ -153,7 +154,7 @@
void FullscreenController::ToggleFullscreenModeForTab(WebContents* web_contents,
bool enter_fullscreen) {
- if (web_contents != browser_->GetActiveWebContents())
+ if (web_contents != chrome::GetActiveWebContents(browser_))
return;
#if defined(OS_WIN)
@@ -529,7 +530,7 @@
toggled_into_fullscreen_ = !window_->InPresentationMode();
GURL url;
if (for_tab) {
- url = browser_->GetActiveWebContents()->GetURL();
+ url = chrome::GetActiveWebContents(browser_)->GetURL();
tab_fullscreen_accepted_ = toggled_into_fullscreen_ &&
GetFullscreenSetting(url) == CONTENT_SETTING_ALLOW;
}
@@ -562,7 +563,7 @@
GURL url;
if (for_tab) {
- url = browser_->GetActiveWebContents()->GetURL();
+ url = chrome::GetActiveWebContents(browser_)->GetURL();
tab_fullscreen_accepted_ = toggled_into_fullscreen_ &&
GetFullscreenSetting(url) == CONTENT_SETTING_ALLOW;
} else {
« no previous file with comments | « chrome/browser/ui/find_bar/find_bar_host_browsertest.cc ('k') | chrome/browser/ui/fullscreen_controller_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698