| Index: chrome/browser/ui/browser.cc
|
| ===================================================================
|
| --- chrome/browser/ui/browser.cc (revision 129471)
|
| +++ chrome/browser/ui/browser.cc (working copy)
|
| @@ -504,14 +504,10 @@
|
| TabRestoreServiceDestroyed(tab_restore_service_);
|
| }
|
|
|
| -bool Browser::IsFullscreenForTabOrPending() const {
|
| - return fullscreen_controller_->IsFullscreenForTabOrPending();
|
| +bool Browser::IsFullscreenForTab() const {
|
| + return fullscreen_controller_->IsFullscreenForTab();
|
| }
|
|
|
| -bool Browser::IsMouseLockedOrPending() const {
|
| - return fullscreen_controller_->IsMouseLockedOrPending();
|
| -}
|
| -
|
| // static
|
| Browser* Browser::Create(Profile* profile) {
|
| Browser* browser = new Browser(TYPE_TABBED, profile);
|
| @@ -4198,7 +4194,7 @@
|
| fullscreen_controller_->ToggleFullscreenModeForTab(tab, enter_fullscreen);
|
| }
|
|
|
| -bool Browser::IsFullscreenForTabOrPending(const WebContents* tab) const {
|
| +bool Browser::IsFullscreenForTab(const WebContents* tab) const {
|
| return fullscreen_controller_->IsFullscreenForTabOrPending(tab);
|
| }
|
|
|
|
|
| Property changes on: chrome/browser/ui/browser.cc
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
|
|
|
|