chrome/browser/ui/browser.cc - Issue 877413004: Refactor away the Browser* dependency in exclusive_access

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/browser.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

« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/browser_window_controller_private.mm » ('j') | chrome/browser/ui/exclusive_access/exclusive_access_context.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/browser.cc

diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc

index 3c96c627608409c05226cbb1043a005d01b984fc..d0f0ccbbdb7287ddecac0f939552614922286e7b 100644

--- a/chrome/browser/ui/browser.cc

+++ b/chrome/browser/ui/browser.cc

@@ -104,6 +104,7 @@

#include "chrome/browser/ui/browser_window.h"

#include "chrome/browser/ui/chrome_pages.h"

#include "chrome/browser/ui/chrome_select_file_policy.h"

+#include "chrome/browser/ui/exclusive_access/exclusive_access_context_browser.h"

#include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"

#include "chrome/browser/ui/exclusive_access/mouse_lock_controller.h"

#include "chrome/browser/ui/fast_unload_controller.h"

@@ -446,7 +447,9 @@ Browser::Browser(const CreateParams& params)

#endif // defined(OS_WIN)

}

- exclusive_access_manager_.reset(new ExclusiveAccessManager(this));

+ scoped_ptr<ExclusiveAccessContextBrowser> context(

+ new ExclusiveAccessContextBrowser(this));

+ exclusive_access_manager_.reset(new ExclusiveAccessManager(context.Pass()));

// Must be initialized after window_.

// Also: surprise! a modal dialog host is not necessary to host modal dialogs