browser: Remove fullscreen functions and have callers call FullscreenController directly.

chrome/browser/ui/browser.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/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 730 matching lines @@
 void Browser::WindowFullscreenStateChanged() {
   fullscreen_controller_->WindowFullscreenStateChanged();
   command_controller_->FullscreenStateChanged();
   UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, Assorted browser commands:
 
 void Browser::ToggleFullscreenMode() {
   fullscreen_controller_->ToggleFullscreenMode();

[scheib, 2012/07/03 17:08:49]

Might as well remove all wrappers around fullscreen_controller_?

[tfarina, 2012/07/03 18:51:22]

Done.

 }
 
 void Browser::ToggleFullscreenModeWithExtension(const GURL& extension_url) {
   fullscreen_controller_->ToggleFullscreenModeWithExtension(extension_url);
 }
 
 #if defined(OS_MACOSX)
 void Browser::TogglePresentationMode() {
   fullscreen_controller_->TogglePresentationMode();
 }
@@ skipping 628 matching lines @@
       fullscreen_controller_->HandleUserPressedEscape()) {
     return true;
   }
   return window()->PreHandleKeyboardEvent(event, is_keyboard_shortcut);
 }
 
 void Browser::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) {
   window()->HandleKeyboardEvent(event);
 }
 
-void Browser::OnAcceptFullscreenPermission(
-    const GURL& url,
-    FullscreenExitBubbleType bubble_type) {
-  fullscreen_controller_->OnAcceptFullscreenPermission(url, bubble_type);
-}
-
-void Browser::OnDenyFullscreenPermission(FullscreenExitBubbleType bubble_type) {
-  fullscreen_controller_->OnDenyFullscreenPermission(bubble_type);
-}
-
 bool Browser::TabsNeedBeforeUnloadFired() {
   if (tabs_needing_before_unload_fired_.empty()) {
     for (int i = 0; i < tab_count(); ++i) {
       WebContents* contents = chrome::GetTabContentsAt(this, i)->web_contents();
       if (contents->NeedToFireBeforeUnload())
         tabs_needing_before_unload_fired_.insert(contents);
     }
   }
   return !tabs_needing_before_unload_fired_.empty();
 }
 
 bool Browser::IsFullscreenForTabOrPending() const {
   return fullscreen_controller_->IsFullscreenForTabOrPending();

[scheib, 2012/07/03 17:08:49]

Might as well remove all wrappers around fullscreen_controller_?

[tfarina, 2012/07/03 18:51:22]

Done.

 }
 
 bool Browser::IsMouseLocked() const {
   return fullscreen_controller_->IsMouseLocked();
 }
 
 void Browser::OnWindowDidShow() {
   if (window_has_shown_)
     return;
   window_has_shown_ = true;
@@ skipping 427 matching lines @@
 }
 
 void Browser::EnumerateDirectory(WebContents* web_contents,
                                  int request_id,
                                  const FilePath& path) {
   FileSelectHelper::EnumerateDirectory(web_contents, request_id, path);
 }
 
 void Browser::ToggleFullscreenModeForTab(WebContents* web_contents,
                                          bool enter_fullscreen) {
   fullscreen_controller_->ToggleFullscreenModeForTab(web_contents,

[scheib, 2012/07/03 17:08:49]

Might as well remove all wrappers around fullscreen_controller_?

[tfarina, 2012/07/03 18:51:22]

This is a virtual function from WebContentsDelegate, so I didn't want to mess
with it in this patch.

                                                      enter_fullscreen);
 }
 
 bool Browser::IsFullscreenForTabOrPending(
     const WebContents* web_contents) const {
   return fullscreen_controller_->IsFullscreenForTabOrPending(web_contents);
 }
 
 void Browser::JSOutOfMemory(WebContents* web_contents) {
   JSOutOfMemoryHelper(web_contents);
@@ skipping 52 matching lines @@
                         const gfx::Rect& selection_rect,
                         int active_match_ordinal,
                         bool final_update) {
   FindReplyHelper(web_contents, request_id, number_of_matches, selection_rect,
                   active_match_ordinal, final_update);
 }
 
 void Browser::RequestToLockMouse(WebContents* web_contents,
                                  bool user_gesture,
                                  bool last_unlocked_by_target) {
   fullscreen_controller_->RequestToLockMouse(web_contents,

[scheib, 2012/07/03 17:08:49]

Might as well remove all wrappers around fullscreen_controller_?

[tfarina, 2012/07/03 18:51:22]

This is a virtual function from WebContentsDelegate, so I didn't want to mess
with it in this patch.

                                              user_gesture,
                                              last_unlocked_by_target);
 }
 
 void Browser::LostMouseLock() {
   fullscreen_controller_->LostMouseLock();
 }
 
 void Browser::RequestMediaAccessPermission(
     content::WebContents* web_contents,
@@ skipping 862 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         content::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }