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

Unified Diff: chrome/browser/ui/cocoa/permission_bubble/chooser_bubble_ui_view_cocoa_views.mm

Issue 2853143003: MacViews: Allows the toolkit-views Device Chooser bubble to be used (Closed)
Patch Set: MacViews: Allows the toolkit-views Device Chooser bubble to be used (separated Mac specifics) Created 3 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/permission_bubble/chooser_bubble_ui_view_cocoa_views.mm
diff --git a/chrome/browser/ui/cocoa/permission_bubble/chooser_bubble_ui_view_cocoa_views.mm b/chrome/browser/ui/cocoa/permission_bubble/chooser_bubble_ui_view_cocoa_views.mm
new file mode 100644
index 0000000000000000000000000000000000000000..bda5b5b6207ffe8c2e59f9628648e909361a1cc9
--- /dev/null
+++ b/chrome/browser/ui/cocoa/permission_bubble/chooser_bubble_ui_view_cocoa_views.mm
@@ -0,0 +1,68 @@
+// Copyright 2017 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/chooser_controller/chooser_controller.h"
+#include "chrome/browser/platform_util.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/cocoa/browser_window_controller.h"
+#import "chrome/browser/ui/cocoa/bubble_anchor_helper_views.h"
+#import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
+#import "chrome/browser/ui/cocoa/permission_bubble/chooser_bubble_ui_cocoa.h"
+#include "chrome/browser/ui/permission_bubble/chooser_bubble_delegate.h"
+#include "chrome/browser/ui/views/permission_bubble/chooser_bubble_ui_view.h"
+#import "ui/base/cocoa/cocoa_base_utils.h"
+#include "ui/base/material_design/material_design_controller.h"
+#import "ui/gfx/mac/coordinate_conversion.h"
+#include "ui/views/bubble/bubble_dialog_delegate.h"
+
+// Implementation of ChooserBubbleUiView's anchor methods for Cocoa browsers. In
+// Cocoa browsers there is no parent views::View for the permission bubble, so
+// these methods supply an anchor point instead.
+
+std::unique_ptr<BubbleUi> ChooserBubbleDelegate::BuildBubbleUi() {
+ if (!ui::MaterialDesignController::IsSecondaryUiMaterial()) {
+ return base::MakeUnique<ChooserBubbleUiCocoa>(
+ browser_, std::move(chooser_controller_));
+ }
+ return base::MakeUnique<ChooserBubbleUiView>(browser_,
+ std::move(chooser_controller_));
+}
+
+void ChooserBubbleUiView::CreateAndShow(
+ views::BubbleDialogDelegateView* delegate) {
+ // Set |parent_window| because some valid anchors can become hidden.
+ gfx::NativeView parent =
+ platform_util::GetViewForWindow(browser_->window()->GetNativeWindow());
+ DCHECK(parent);
+ delegate->set_parent_window(parent);
+ views::BubbleDialogDelegateView::CreateBubble(delegate)->Show();
+ KeepBubbleAnchored(delegate);
+}
+
+views::View* ChooserBubbleUiView::GetAnchorView() {
+ return nullptr;
+}
+
+gfx::Point ChooserBubbleUiView::GetAnchorPoint() {
+ NSWindow* parent = browser_->window()->GetNativeWindow();
+ BrowserWindowController* controller = [parent windowController];
+ NSPoint origin = NSZeroPoint;
+ if ([controller isKindOfClass:[BrowserWindowController class]]) {
+ LocationBarViewMac* location_bar = [controller locationBarBridge];
+ if (location_bar) {
+ NSPoint bubble_point = location_bar->GetPageInfoBubblePoint();
+ origin = ui::ConvertPointFromWindowToScreen(parent, bubble_point);
+ }
+ }
+ gfx::Point anchor_point = gfx::ScreenPointFromNSPoint(origin);
tapted 2017/05/03 05:23:09 yah it I really think this needs to go into the he
varkha 2017/05/03 08:47:03 Done.
+ return anchor_point;
+}
+
+views::BubbleBorder::Arrow ChooserBubbleUiView::GetAnchorArrow() {
+ if (browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR))
+ return views::BubbleBorder::TOP_LEFT;
+ return views::BubbleBorder::NONE;
+}

Powered by Google App Engine
This is Rietveld 408576698