chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.mm - Issue 1140223003: [PermissionBubble] identical ctor across platforms.

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_bubble_cocoa.mm

Issue 1140223003: [PermissionBubble] identical ctor across platforms. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@permbubble

Patch Set: Fixed nullptr/NULL/nil issues Created 5 years, 7 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_cocoa.h ('k') | chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa_browser_test.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 6f9cfc5a075e377c5c0d93e96db57b70dea59ee5..ee2f13c21bb572c67a296830c535bd2de18f8dd6 100644

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

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

@@ -4,6 +4,7 @@

#include "chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h"

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

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

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

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

@@ -12,8 +13,12 @@

#include "content/public/browser/web_contents.h"

#import "ui/base/cocoa/nsview_additions.h"

-PermissionBubbleCocoa::PermissionBubbleCocoa(NSWindow* parent_window)

- : parent_window_(parent_window), delegate_(NULL), bubbleController_(nil) {}

+PermissionBubbleCocoa::PermissionBubbleCocoa(Browser* browser)

+ : parent_window_(nil), delegate_(nullptr), bubbleController_(nil) {

+ // Browser is allowed to be nullptr for testing purposes.

+ if (browser)

+ parent_window_ = browser->window()->GetNativeWindow();

PermissionBubbleCocoa::~PermissionBubbleCocoa() {

if (delegate_)