Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3019)

Unified Diff: chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc

Issue 877413004: Refactor away the Browser* dependency in exclusive_access (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove Browser* dependency from ExclusiveAccess* in Cocoa. Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc
diff --git a/chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc b/chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc
index 178e97da676f62b47c684252d9838b92c0345427..9cf69ae603df91112614fa76e56a9c176f7dc5b5 100644
--- a/chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc
+++ b/chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc
@@ -7,8 +7,8 @@
#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"
@@ -32,10 +32,10 @@ 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_);
}
@@ -115,23 +115,22 @@ void ExclusiveAccessBubble::CheckMousePosition() {
}
void ExclusiveAccessBubble::ToggleFullscreen() {
- 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 {

Powered by Google App Engine
This is Rietveld 408576698