chrome/browser/ui/views/frame/browser_view.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/views/frame/browser_view.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

« chrome/browser/ui/exclusive_access/exclusive_access_context.h ('K') | « chrome/browser/ui/views/exclusive_access_bubble_views_context_browser.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/frame/browser_view.cc

diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc

index 96e16bf785fed54c7f2099db9dc6fbfd8cdacbe2..e9e56721f6cbbcd14758aeda5eb717befd1ec6b4 100644

--- a/chrome/browser/ui/views/frame/browser_view.cc

+++ b/chrome/browser/ui/views/frame/browser_view.cc

@@ -64,6 +64,7 @@

#include "chrome/browser/ui/views/download/download_in_progress_dialog_view.h"

#include "chrome/browser/ui/views/download/download_shelf_view.h"

#include "chrome/browser/ui/views/exclusive_access_bubble_views.h"

+#include "chrome/browser/ui/views/exclusive_access_bubble_views_context_browser.h"

#include "chrome/browser/ui/views/extensions/bookmark_app_bubble_view.h"

#include "chrome/browser/ui/views/frame/browser_view_layout.h"

#include "chrome/browser/ui/views/frame/browser_view_layout_delegate.h"

@@ -956,8 +957,10 @@ void BrowserView::UpdateFullscreenExitBubbleContent(

} else if (exclusive_access_bubble_.get()) {

exclusive_access_bubble_->UpdateContent(url, bubble_type);

} else {

+ scoped_ptr<ExclusiveAccessBubbleViewsContextBrowser> context(

+ new ExclusiveAccessBubbleViewsContextBrowser(this));

exclusive_access_bubble_.reset(

- new ExclusiveAccessBubbleViews(this, url, bubble_type));

+ new ExclusiveAccessBubbleViews(context.Pass(), url, bubble_type));

}