Refactor away the Browser* dependency in exclusive_access

chrome/browser/ui/exclusive_access/exclusive_access_manager.h

 // Copyright (c) 2015 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_EXCLUSIVE_ACCESS_EXCLUSIVE_ACCESS_MANAGER_H_
 #define CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_EXCLUSIVE_ACCESS_MANAGER_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.h"
 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
 #include "chrome/browser/ui/exclusive_access/mouse_lock_controller.h"
 
-class Browser;
+class ExclusiveAccessContext;
 class FullscreenController;
 class GURL;
 class MouseLockController;
 
 namespace content {
 class WebContents;
 }
 
 // This class combines the different exclusive access modes (like fullscreen and
 // mouse lock) which are each handled by respective controller. It also updates
 // the exit bubble to reflect the combined state.
 class ExclusiveAccessManager {
  public:
-  explicit ExclusiveAccessManager(Browser* browser);
+  explicit ExclusiveAccessManager(
+      ExclusiveAccessContext* exclusive_access_context);
   ~ExclusiveAccessManager();
 
   FullscreenController* fullscreen_controller() {
     return &fullscreen_controller_;
   }
 
   MouseLockController* mouse_lock_controller() {
     return &mouse_lock_controller_;
   }
 
+  ExclusiveAccessContext* exclusive_access_context() {

[miu, 2015/02/26 20:07:57]

Method should be const.

[miu, 2015/02/26 20:07:57]

This seems to be causing a ton of 3+ line statements, especially in
fullscreen_controller.cc.  Example:

  WebContents* const active_web_contents = exclusive_access_manager()
                                               ->exclusive_access_context()
                                               ->GetActiveWebContents();

Consider renaming this method to just context() to simplify all code that gets
the ExclusiveAccessContext*.  The above example would become:

  WebContents* const active_web_contents =
      exclusive_access_manager()->context()->GetActiveWebContents();

[Sriram, 2015/02/26 23:58:03]

Done.

[Sriram, 2015/02/26 23:58:03]

Done.

+    return exclusive_access_context_;
+  }
+
   ExclusiveAccessBubbleType GetExclusiveAccessExitBubbleType() const;
   void UpdateExclusiveAccessExitBubbleContent();
 
   GURL GetExclusiveAccessBubbleURL() const;
 
   // Callbacks ////////////////////////////////////////////////////////////////
 
   // Called by Browser::TabDeactivated.
   void OnTabDeactivated(content::WebContents* web_contents);
 
   // Called by Browser::ActiveTabChanged.
   void OnTabDetachedFromView(content::WebContents* web_contents);
 
   // Called by Browser::TabClosingAt.
   void OnTabClosing(content::WebContents* web_contents);
 
   // Called by Browser::PreHandleKeyboardEvent
   bool HandleUserPressedEscape();
 
   // Called by platform ExclusiveAccessExitBubble.
   void OnAcceptExclusiveAccessPermission();
   void OnDenyExclusiveAccessPermission();
+  void ExitExclusiveAccess();
 
  private:
-  Browser* const browser_;
+  ExclusiveAccessContext* exclusive_access_context_;

[miu, 2015/02/26 20:07:57]

ExclusiveAccessContext* const ...;

[Sriram, 2015/02/26 23:58:03]

Done.

   FullscreenController fullscreen_controller_;
   MouseLockController mouse_lock_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(ExclusiveAccessManager);
 };
 
 #endif  // CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_EXCLUSIVE_ACCESS_MANAGER_H_