Refactor away the Browser* dependency in exclusive_access

chrome/browser/ui/exclusive_access/exclusive_access_bubble.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/exclusive_access/exclusive_access_bubble.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_commands.h"
+#include "chrome/browser/ui/exclusive_access/exclusive_access_context.h"
+#include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h"
 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
 #include "chrome/grit/generated_resources.h"
 #include "extensions/browser/extension_registry.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/strings/grit/ui_strings.h"
 
 // NOTE(koz): Linux doesn't use the thick shadowed border, so we add padding
 // here.
 #if defined(OS_LINUX)
 const int ExclusiveAccessBubble::kPaddingPx = 8;
 #else
 const int ExclusiveAccessBubble::kPaddingPx = 15;
 #endif
 const int ExclusiveAccessBubble::kInitialDelayMs = 3800;
 const int ExclusiveAccessBubble::kIdleTimeMs = 2300;
 const int ExclusiveAccessBubble::kPositionCheckHz = 10;
 const int ExclusiveAccessBubble::kSlideInRegionHeightPx = 4;
 const int ExclusiveAccessBubble::kSlideInDurationMs = 350;
 const int ExclusiveAccessBubble::kSlideOutDurationMs = 700;
 const int ExclusiveAccessBubble::kPopupTopPx = 15;
 
 ExclusiveAccessBubble::ExclusiveAccessBubble(
-    Browser* browser,
+    ExclusiveAccessManager* manager,
     const GURL& url,
     ExclusiveAccessBubbleType bubble_type)
-    : browser_(browser), url_(url), bubble_type_(bubble_type) {
+    : manager_(manager), url_(url), bubble_type_(bubble_type) {
   DCHECK_NE(EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE, bubble_type_);
 }
 
 ExclusiveAccessBubble::~ExclusiveAccessBubble() {
 }
 
 void ExclusiveAccessBubble::StartWatchingMouse() {
   // Start the initial delay timer and begin watching the mouse.
   initial_delay_.Start(FROM_HERE,
                        base::TimeDelta::FromMilliseconds(kInitialDelayMs), this,
@@ skipping 58 matching lines @@
   } else if (cursor_pos.y() < kSlideInRegionHeightPx &&
              CanMouseTriggerSlideIn()) {
     Show();
   } else if (IsAnimating()) {
     // The cursor is not idle and either it's in the slide-in region or it's in
     // the neutral region and we're sliding in or out.
     Show();
   }
 }
 
 void ExclusiveAccessBubble::ToggleFullscreen() {

[scheib, 2015/02/25 19:30:13]

While here, would you fix this too please: Rename
ExclusiveAccessBubble::ToggleFullscreen ->
ExclusiveAccessBubble::ExitExclusiveAccess

[Sriram, 2015/02/25 21:53:27]

Actually this is explicitly dealing with fullscreen and not exiting exclusive
access so leaving this one as such.

[scheib, 2015/02/25 22:31:51]

It shouldn't be "Toggle", it is definitely not Toggling.

The only impl is Fullscreen now, but for keyboard lock without pointer lock
won't we want it to exit keyboard lock?

At this point in code I think the abstracted concept ExitExclusiveAccess is
fitting.

[Sriram, 2015/02/25 23:15:59]

Done.

-  browser_->exclusive_access_manager()
-      ->fullscreen_controller()
-      ->ExitExclusiveAccessToPreviousState();
+  manager_->fullscreen_controller()->ExitExclusiveAccessToPreviousState();
 }
 
 void ExclusiveAccessBubble::Accept() {
-  browser_->exclusive_access_manager()->OnAcceptExclusiveAccessPermission();
+  manager_->OnAcceptExclusiveAccessPermission();
 }
 
 void ExclusiveAccessBubble::Cancel() {
-  browser_->exclusive_access_manager()->OnDenyExclusiveAccessPermission();
+  manager_->OnDenyExclusiveAccessPermission();
 }
 
 base::string16 ExclusiveAccessBubble::GetCurrentMessageText() const {
   return exclusive_access_bubble::GetLabelTextForType(
       bubble_type_, url_,
-      extensions::ExtensionRegistry::Get(browser_->profile()));
+      extensions::ExtensionRegistry::Get(
+          manager_->exclusive_access_context()->GetProfile()));
 }
 
 base::string16 ExclusiveAccessBubble::GetCurrentDenyButtonText() const {
   return exclusive_access_bubble::GetDenyButtonTextForType(bubble_type_);
 }
 
 base::string16 ExclusiveAccessBubble::GetCurrentAllowButtonText() const {
   return exclusive_access_bubble::GetAllowButtonTextForType(bubble_type_, url_);
 }
 
 base::string16 ExclusiveAccessBubble::GetInstructionText() const {
   return l10n_util::GetStringFUTF16(IDS_FULLSCREEN_PRESS_ESC_TO_EXIT,
                                     l10n_util::GetStringUTF16(IDS_APP_ESC_KEY));
 }