chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.mm - Issue 1935993004: MacViews: support Views permission bubble

Unified Diff: chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.mm

Issue 1935993004: MacViews: support Views permission bubble (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: factor out Views delegate Created 4 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

« chrome/browser/ui/cocoa/website_settings/permission_bubble_anchor_delegate_views_cocoa.mm ('K') | « chrome/browser/ui/cocoa/website_settings/permission_bubble_anchor_delegate_views_cocoa.mm ('k') | chrome/browser/ui/views/website_settings/permission_bubble_anchor_delegate_views.cc » ('j') | chrome/browser/ui/views/website_settings/permission_bubble_anchor_delegate_views.cc » ('J')
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 e0438ee00c17c8a11114591dd33688df4546a580..853208107cf3ac9f6a90e5b37401fd06fa75ab3c 100644

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

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

@@ -5,11 +5,18 @@

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

#include "base/memory/ptr_util.h"

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

tapted 2016/05/11 07:06:18 I think all the 7 new headers showing up in the di

Elly Fong-Jones 2016/05/11 19:16:37 Done.

+#include "chrome/browser/ui/browser_dialogs.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"

#import "chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.h"

#import "chrome/browser/ui/website_settings/permission_bubble_view.h"

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

+#import "ui/base/cocoa/cocoa_base_utils.h"

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

+#include "ui/gfx/mac/coordinate_conversion.h"

PermissionBubbleCocoa::PermissionBubbleCocoa(Browser* browser)

: browser_(browser), delegate_(nullptr), bubbleController_(nil) {

@@ -19,12 +26,6 @@ PermissionBubbleCocoa::PermissionBubbleCocoa(Browser* browser)

PermissionBubbleCocoa::~PermissionBubbleCocoa() {

}

-// static

-std::unique_ptr<PermissionBubbleView> PermissionBubbleView::Create(

- Browser* browser) {

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

void PermissionBubbleCocoa::Show(

const std::vector<PermissionBubbleRequest*>& requests,

const std::vector<bool>& accept_state) {