[Mac] Enable MacViews site settings bubble behind --enable-mac-views-dialogs.

chrome/browser/ui/views/browser_dialogs_views_mac.cc

Index: chrome/browser/ui/views/browser_dialogs_views_mac.cc
diff --git a/chrome/browser/ui/views/browser_dialogs_views_mac.cc b/chrome/browser/ui/views/browser_dialogs_views_mac.cc
new file mode 100644
index 0000000000000000000000000000000000000000..aeb5d4d80ebfad4971b3a16e463fa130068db5b0
--- /dev/null
+++ b/chrome/browser/ui/views/browser_dialogs_views_mac.cc
@@ -0,0 +1,78 @@
+// Copyright 2015 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 "chrome/browser/ui/browser_dialogs.h"
+
+#include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h"
+#include "content/public/browser/web_contents_observer.h"
+#include "ui/views/widget/widget_observer.h"
+
+// This file provides definitions of desktop browser dialog-creation methods for
+// Mac where a Cocoa browser is using Views dialogs.
+
+namespace {
+
+// Creates an anchor view for a bubble and deletes it when the bubble is closed.
+// It also closes the bubble when the parent WebContents is destroyed since the
+// anchor view does not have its own Widget for the BubbleDelegateView to
+// observe. Owns itself.
+class BubbleAnchorViewAdapter : public views::WidgetObserver,

[msw, 2015/08/11 22:09:11]

Yeah, this seems far from optimal... (1) Using a point instead of a rect will
cause the bubble to overlap the button/view it's anchored to, if the bubble
needs to mirror itself to fit on screen. (2) This seems more heavy-handed than
necessary. Can you instead just use BubbleDelegateView::SetAnchorRect()? 

[jackhou1, 2015/08/12 06:02:11]

SetAnchorRect would be good. Do you think it's okay to just make it public?
Otherwise we could change BubbleDelegateView::GetAnchorRect to check whether
there's a Widget and, if not, use View::bounds() instead of GetBoundsInScreen
since the latter ignores the origin if there's no Widget. Another option is
https://codereview.chromium.org/1279023002/ but that may have wider
implications.

[msw, 2015/08/12 16:52:43]

Make a public helper on WebsiteSettingsPopupView instead of exposing
BubbleDelegateView::SetAnchorRect (at least for now, unless/until we decide that
it's needed in more places). I don't think changing GetAnchorRect as you suggest
is any better. I'm dubious about the other CL, but sky@ might approve that with
a good justification and set of tests. I suggest setting a custom anchor_rect_
as the simplest approach.

[jackhou1, 2015/08/17 04:54:19]

Done.

Added a static helper WebsiteSettingsPopupView::ShowPopupAtRect() to avoid
exposing InternalPageInfoPopupView.

It turns out on Cocoa, the bubble is never mirrored, it is always below and to
the right. Seems simplest to keep this the same for MacViews as we won't need to
get the rect of the location icon. Plus it's more consistent with Cocoa.

+                                public content::WebContentsObserver {
+ public:
+  BubbleAnchorViewAdapter(const gfx::Point& anchor_point,
+                          Profile* profile,
+                          content::WebContents* web_contents,
+                          const GURL& url,
+                          const content::SSLStatus& ssl)
+      : anchor_view_(new views::View) {
+    // Since the view doesn't have a container Widget,
+    // View::ConvertPointToScreen will assume its origin is 0,0. Create a rect
+    // where the midpoint of the bottom edge is at the anchor point.
+    // Note that this will not work for windows to the left of the screen
+    // origin, e.g. in multi-monitor setups.
+    // TODO(jackhou): Make this adapter manage a Widget that is a child of
+    // BrowserWindowCocoa. This fixes the multi-monitor problem and is needed
+    // for bubbles that can stay open, e.g. extensions.
+    anchor_view_->SetBounds(
+        0, 0, anchor_point.x() * 2,
+        anchor_point.y() +
+            WebsiteSettingsPopupView::kLocationIconVerticalMargin);
+    views::BubbleDelegateView* bubble_view =
+        WebsiteSettingsPopupView::ShowPopup(anchor_view_.get(), profile,
+                                            web_contents, url, ssl);
+
+    widget_ = bubble_view->GetWidget();
+    widget_->AddObserver(this);
+    Observe(web_contents);
+  }
+
+  ~BubbleAnchorViewAdapter() override {}
+
+  // WidgetObserver:
+  void OnWidgetDestroyed(views::Widget* widget) override { delete this; }
+
+  // content::WebContentsObserver:
+  void WebContentsDestroyed() override { widget_->Close(); }
+
+ private:
+  // This view should never be (or have been) inserted into a view heirarchy.
+  scoped_ptr<views::View> anchor_view_;
+  views::Widget* widget_;
+
+  DISALLOW_COPY_AND_ASSIGN(BubbleAnchorViewAdapter);
+};
+
+}  // namespace
+
+namespace chrome {
+
+void ShowWebsiteSettingsBubbleViewsAtPoint(const gfx::Point& anchor_point,
+                                           Profile* profile,
+                                           content::WebContents* web_contents,
+                                           const GURL& url,
+                                           const content::SSLStatus& ssl) {
+  new BubbleAnchorViewAdapter(anchor_point, profile, web_contents, url, ssl);
+}
+
+}  // namespace chrome