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

Unified Diff: chrome/browser/ui/cocoa/website_settings/permission_bubble_anchor_delegate_views_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
Index: chrome/browser/ui/cocoa/website_settings/permission_bubble_anchor_delegate_views_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/website_settings/permission_bubble_anchor_delegate_views_cocoa.mm b/chrome/browser/ui/cocoa/website_settings/permission_bubble_anchor_delegate_views_cocoa.mm
new file mode 100644
index 0000000000000000000000000000000000000000..df720cf2bb6bfb21c757951f870ce08880085c9c
--- /dev/null
+++ b/chrome/browser/ui/cocoa/website_settings/permission_bubble_anchor_delegate_views_cocoa.mm
@@ -0,0 +1,73 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#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/browser_window_controller.h"
+#import "chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h"
+#import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
+#include "chrome/browser/ui/views/website_settings/permissions_bubble_view.h"
+#import "ui/base/cocoa/cocoa_base_utils.h"
+#include "ui/gfx/mac/coordinate_conversion.h"
tapted 2016/05/11 07:06:18 nit: import
Elly Fong-Jones 2016/05/11 19:16:37 Done.
+
+// Implementation of PermissionBubbleViewViews' AnchorDelegate for Cocoa
tapted 2016/05/11 07:06:18 you can start an anonymous namespace { here
Elly Fong-Jones 2016/05/11 19:16:37 Done.
+// browsers. In Cocoa browsers there is no parent views::View for the permission
+// bubble, so this class supplies an anchor point instead.
+class PermissionBubbleAnchorDelegateViewsCocoa
+ : public PermissionBubbleViewViews::AnchorDelegate {
+ public:
+ PermissionBubbleAnchorDelegateViewsCocoa(Browser* browser);
tapted 2016/05/11 07:06:18 nit: explicit
Elly Fong-Jones 2016/05/11 19:16:37 Done.
+ ~PermissionBubbleAnchorDelegateViewsCocoa() override;
tapted 2016/05/11 07:06:18 does this need to be declared? the default one sho
Elly Fong-Jones 2016/05/11 19:16:37 Done.
+
+ // AnchorDelegate:
+ views::View* GetAnchorView() override;
+ gfx::Point GetAnchorPoint() override;
+
+ private:
+ Browser* browser_;
+ DISALLOW_COPY_AND_ASSIGN(PermissionBubbleAnchorDelegateViewsCocoa);
tapted 2016/05/11 07:06:18 nit: blank line before
Elly Fong-Jones 2016/05/11 19:16:37 Done.
+};
+
+PermissionBubbleAnchorDelegateViewsCocoa::
+ PermissionBubbleAnchorDelegateViewsCocoa(Browser* browser)
+ : browser_(browser) {}
+
+PermissionBubbleAnchorDelegateViewsCocoa::
+ ~PermissionBubbleAnchorDelegateViewsCocoa() {}
+
+views::View* PermissionBubbleAnchorDelegateViewsCocoa::GetAnchorView() {
+ return nullptr;
+}
+
+gfx::Point PermissionBubbleAnchorDelegateViewsCocoa::GetAnchorPoint() {
+ NSWindow* window = browser_->window()->GetNativeWindow();
+ BrowserWindowController* controller =
+ [BrowserWindowController browserWindowControllerForWindow:window];
+ NSPoint point;
+ if ([controller hasLocationBar]) {
+ point = [controller locationBarBridge]->GetPageInfoBubblePoint();
+ } else {
+ NSRect frame = [[window contentView] frame];
+ point = NSMakePoint(NSMidX(frame), NSMaxY(frame));
+ }
+ return gfx::ScreenPointFromNSPoint(
+ ui::ConvertPointFromWindowToScreen(window, point));
+}
+
tapted 2016/05/11 07:06:18 } // namespace
Elly Fong-Jones 2016/05/11 19:16:37 Done.
+// static
+std::unique_ptr<PermissionBubbleViewViews::AnchorDelegate>
+PermissionBubbleViewViews::CreateAnchorDelegate(Browser* browser) {
+ return base::WrapUnique(
+ new PermissionBubbleAnchorDelegateViewsCocoa(browser));
+}
+
+// static
+std::unique_ptr<PermissionBubbleView> PermissionBubbleView::Create(
+ Browser* browser) {
+ if (chrome::ToolkitViewsWebUIDialogsEnabled())
+ return base::WrapUnique(new PermissionBubbleViewViews(browser));
+ return base::WrapUnique(new PermissionBubbleCocoa(browser));
+}

Powered by Google App Engine
This is Rietveld 408576698