chrome/browser/ui/cocoa/website_settings/permission_prompt_impl_views_mac.mm - Issue 2335623002: Use WebContents instead of Browser to construct PermissionPrompt

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/cocoa/website_settings/permission_prompt_impl_views_mac.mm

Issue 2335623002: Use WebContents instead of Browser to construct PermissionPrompt (Closed)

Patch Set: address review comments Created 4 years, 3 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 | « chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.h ('k') | chrome/browser/ui/views/website_settings/permission_prompt_impl_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/website_settings/permission_prompt_impl_views_mac.mm

diff --git a/chrome/browser/ui/cocoa/website_settings/permission_prompt_impl_views_mac.mm b/chrome/browser/ui/cocoa/website_settings/permission_prompt_impl_views_mac.mm

index 55da7da287cac32566c3a51d66df51e6a79bb2a1..469f9cc6c3fe752d1f3da50f76b4ceb92868d787 100644

--- a/chrome/browser/ui/cocoa/website_settings/permission_prompt_impl_views_mac.mm

+++ b/chrome/browser/ui/cocoa/website_settings/permission_prompt_impl_views_mac.mm

@@ -5,6 +5,7 @@

#include "base/memory/ptr_util.h"

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

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

+#include "chrome/browser/ui/browser_finder.h"

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

#import "chrome/browser/ui/cocoa/browser_window_controller.h"

#import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"

@@ -32,8 +33,11 @@ views::BubbleBorder::Arrow PermissionPromptImpl::GetAnchorArrow() {

}

// static

-std::unique_ptr<PermissionPrompt> PermissionPrompt::Create(Browser* browser) {

+std::unique_ptr<PermissionPrompt> PermissionPrompt::Create(

+ content::WebContents* web_contents) {

if (chrome::ToolkitViewsWebUIDialogsEnabled())

- return base::WrapUnique(new PermissionPromptImpl(browser));

- return base::MakeUnique<PermissionBubbleCocoa>(browser);

+ return base::WrapUnique(new PermissionPromptImpl(

+ chrome::FindBrowserWithWebContents(web_contents)));

+ return base::MakeUnique<PermissionBubbleCocoa>(

+ chrome::FindBrowserWithWebContents(web_contents));

}