Chromium Code Reviews| 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..90d7a243f9b7b3516aee3395b72f0b94a791373c 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_(NULL), bubbleController_(nil) { |
|
Robert Sesek
2015/05/19 22:28:00
nullptr here?
groby-ooo-7-16
2015/05/20 01:12:47
Hey, that's not *my* code :)
Done.
|
| + // Browser is allowed to be nil for testing purposes. |
|
Robert Sesek
2015/05/19 22:28:00
Browser is C++, so NULL not nil.
groby-ooo-7-16
2015/05/20 01:12:47
Well, nullptr :)
Done.
|
| + if (browser) |
| + parent_window_ = browser->window()->GetNativeWindow(); |
| +} |
| PermissionBubbleCocoa::~PermissionBubbleCocoa() { |
| if (delegate_) |