Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(615)

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: Created 4 years, 8 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
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..a1e0496ce114e346bbe2b6bb7362806b309d5c40 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,19 @@
#include "chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h"
#include "base/memory/ptr_util.h"
+#include "chrome/browser/ui/browser.h"
+#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"
+#include "chrome/browser/ui/cocoa/website_settings/permission_bubble_anchor_delegate_views_cocoa.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) {
@@ -22,6 +30,12 @@ PermissionBubbleCocoa::~PermissionBubbleCocoa() {
// static
std::unique_ptr<PermissionBubbleView> PermissionBubbleView::Create(
Browser* browser) {
+ if (chrome::ToolkitViewsWebUIDialogsEnabled()) {
+ std::unique_ptr<PermissionBubbleViewViews::AnchorDelegate> delegate(
+ new PermissionBubbleAnchorDelegateViewsCocoa(browser));
+ return base::WrapUnique(
+ new PermissionBubbleViewViews(browser, std::move(delegate)));
tapted 2016/05/03 12:02:38 so... for IWYU, permission_bubble_cocoa.mm really
Elly Fong-Jones 2016/05/10 21:21:02 Done.
+ }
return base::WrapUnique(new PermissionBubbleCocoa(browser));
}

Powered by Google App Engine
This is Rietveld 408576698