Refactor fullscreen_controller.

chrome/browser/ui/browser.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_BROWSER_H_
 #define CHROME_BROWSER_UI_BROWSER_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "base/prefs/pref_member.h"
 #include "base/scoped_observer.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/devtools/devtools_toggle_action.h"
 #include "chrome/browser/ui/bookmarks/bookmark_bar.h"
 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h"
+#include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/search/search_tab_helper_delegate.h"
 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "components/sessions/session_id.h"
 #include "components/ui/zoom/zoom_observer.h"
@@ skipping 13 matching lines @@
 #endif
 
 class BrowserContentSettingBubbleModelDelegate;
 class BrowserContentTranslateDriverObserver;
 class BrowserInstantController;
 class BrowserSyncedWindowDelegate;
 class BrowserToolbarModelDelegate;
 class BrowserTabRestoreServiceDelegate;
 class BrowserWindow;
 class FindBarController;
-class FullscreenController;
 class PrefService;
 class Profile;
 class SearchDelegate;
 class SearchModel;
 class StatusBubble;
 class TabStripModel;
 class TabStripModelDelegate;
 struct WebApplicationInfo;
 
 namespace chrome {
@@ skipping 397 matching lines @@
 
   // Called each time the browser window is shown.
   void OnWindowDidShow();
 
   // Show the first run search engine bubble on the location bar.
   void ShowFirstRunBubble();
 
   // Show a download on the download shelf.
   void ShowDownload(content::DownloadItem* download);
 
-  FullscreenController* fullscreen_controller() const {
-    return fullscreen_controller_.get();
+  ExclusiveAccessManager* GetExclusiveAccessManager() const {

[miu, 2015/01/16 22:17:38]

style: Inlined accessor should be named exclusive_access_manager().

[Sriram, 2015/01/21 01:38:56]

Done.

+    return exclusive_access_manager_.get();
   }
 
   extensions::WindowController* extension_window_controller() const {
     return extension_window_controller_.get();
   }
 
  private:
   friend class BrowserTest;
   friend class FullscreenControllerInteractiveTest;
   friend class FullscreenControllerTest;
@@ skipping 456 matching lines @@
   // Helper which implements the TabRestoreServiceDelegate interface.
   scoped_ptr<BrowserTabRestoreServiceDelegate> tab_restore_service_delegate_;
 
   // Helper which implements the SyncedWindowDelegate interface.
   scoped_ptr<BrowserSyncedWindowDelegate> synced_window_delegate_;
 
   scoped_ptr<BrowserInstantController> instant_controller_;
 
   BookmarkBar::State bookmark_bar_state_;
 
-  scoped_ptr<FullscreenController> fullscreen_controller_;
+  scoped_ptr<ExclusiveAccessManager> exclusive_access_manager_;

[miu, 2015/01/16 22:17:38]

nit: Let's get rid of the extra indirection and heap allocation.  This, here,
should be just:

  ExclusiveAccessManager exclusive_access_manager_;

[Sriram, 2015/01/21 01:38:56]

Browser object construction is complex with some members like window not being
fully constructed. I think passing that to constructor is asking for trouble and
so I am leaning on leaving it be as heap member.

 
   scoped_ptr<extensions::WindowController> extension_window_controller_;
 
   scoped_ptr<chrome::BrowserCommandController> command_controller_;
 
   // True if the browser window has been shown at least once.
   bool window_has_shown_;
 
   scoped_ptr<BrowserContentTranslateDriverObserver> translate_driver_observer_;
 
   scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_;
 
   // The following factory is used for chrome update coalescing.
   base::WeakPtrFactory<Browser> chrome_updater_factory_;
 
   // The following factory is used to close the frame at a later time.
   base::WeakPtrFactory<Browser> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Browser);
 };
 
 #endif  // CHROME_BROWSER_UI_BROWSER_H_