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

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

Issue 877413004: Refactor away the Browser* dependency in exclusive_access (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update based on CR comments Created 5 years, 10 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_manager.cc
diff --git a/chrome/browser/ui/exclusive_access/exclusive_access_manager.cc b/chrome/browser/ui/exclusive_access/exclusive_access_manager.cc
index 56a8cc6df0c4175711561dffdeb2fa46041ae051..14b3aaba14ab69492b73f6ba287a8b974b93dff2 100644
--- a/chrome/browser/ui/exclusive_access/exclusive_access_manager.cc
+++ b/chrome/browser/ui/exclusive_access/exclusive_access_manager.cc
@@ -7,15 +7,17 @@
#include "chrome/browser/app_mode/app_mode_utils.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/exclusive_access/exclusive_access_context.h"
#include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
#include "chrome/browser/ui/exclusive_access/mouse_lock_controller.h"
using content::WebContents;
-ExclusiveAccessManager::ExclusiveAccessManager(Browser* browser)
- : browser_(browser),
- fullscreen_controller_(this, browser),
- mouse_lock_controller_(this, browser) {
+ExclusiveAccessManager::ExclusiveAccessManager(
+ ExclusiveAccessContext* exclusive_access_context)
+ : exclusive_access_context_(exclusive_access_context),
+ fullscreen_controller_(this),
+ mouse_lock_controller_(this) {
}
ExclusiveAccessManager::~ExclusiveAccessManager() {
@@ -71,7 +73,8 @@ void ExclusiveAccessManager::UpdateExclusiveAccessExitBubbleContent() {
mouse_lock_controller_.IsMouseLocked())
mouse_lock_controller_.UnlockMouse();
- browser_->window()->UpdateFullscreenExitBubbleContent(url, bubble_type);
+ exclusive_access_context_->UpdateExclusiveAccessExitBubbleContent(
+ url, bubble_type);
}
GURL ExclusiveAccessManager::GetExclusiveAccessBubbleURL() const {

Powered by Google App Engine
This is Rietveld 408576698