MacViews: support Views permission bubble

chrome/browser/ui/views/website_settings/permissions_bubble_view.cc

 // Copyright 2014 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/views/website_settings/permissions_bubble_view.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/exclusive_access_bubble_views.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"

[tapted, 2016/05/03 12:02:38]

none of browser_view.h top_container_view.h location_bar_view.h
location_icon_view.h are compiled into the Mac build. We really need to move all
the things that need them into their own file -- probably along with the
ViewsAnchorDelegate (which, hopefully, is also the _only_ thing that needs
them...)

[Elly Fong-Jones, 2016/05/10 21:21:02]

Done.

 #include "chrome/browser/ui/views/frame/top_container_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/browser/ui/views/location_bar/location_icon_view.h"
 #include "chrome/browser/ui/views/website_settings/permission_selector_view.h"
 #include "chrome/browser/ui/views/website_settings/permission_selector_view_observer.h"
 #include "chrome/browser/ui/website_settings/permission_bubble_request.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/url_formatter/elide_url.h"
 #include "grit/components_strings.h"
 #include "ui/accessibility/ax_view_state.h"
@@ skipping 116 matching lines @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // View implementation for the permissions bubble.
 class PermissionsBubbleDialogDelegateView
     : public views::BubbleDialogDelegateView,
       public PermissionCombobox::Listener {
  public:
   PermissionsBubbleDialogDelegateView(
       views::View* anchor_view,
+      gfx::Point anchor_point,

[tapted, 2016/05/03 12:02:38]

nit: const reference

[Elly Fong-Jones, 2016/05/10 21:21:02]

Done.

       views::BubbleBorder::Arrow anchor_arrow,
       PermissionBubbleViewViews* owner,
       const std::vector<PermissionBubbleRequest*>& requests,
       const std::vector<bool>& accept_state);
   ~PermissionsBubbleDialogDelegateView() override;
 
   void CloseBubble();
   void SizeToContents();
 
   // BubbleDialogDelegateView:
@@ skipping 22 matching lines @@
   bool multiple_requests_;
   base::string16 display_origin_;
   std::unique_ptr<PermissionMenuModel> menu_button_model_;
   std::vector<PermissionCombobox*> customize_comboboxes_;
 
   DISALLOW_COPY_AND_ASSIGN(PermissionsBubbleDialogDelegateView);
 };
 
 PermissionsBubbleDialogDelegateView::PermissionsBubbleDialogDelegateView(
     views::View* anchor_view,
+    gfx::Point anchor_point,
     views::BubbleBorder::Arrow anchor_arrow,
     PermissionBubbleViewViews* owner,
     const std::vector<PermissionBubbleRequest*>& requests,
     const std::vector<bool>& accept_state)
     : views::BubbleDialogDelegateView(anchor_view, anchor_arrow),
       owner_(owner),
       multiple_requests_(requests.size() > 1) {
   DCHECK(!requests.empty());
 
+  if (!anchor_view)
+    SetAnchorRect(gfx::Rect(anchor_point, gfx::Size()));

[tapted, 2016/05/03 12:02:38]

(see later comment about UpdateAnchor() -- it might be possible to just call
UpdateAnchor() rather than passing in anchor_point to the constructor as well)

[Elly Fong-Jones, 2016/05/10 21:21:02]

It's not safe to call UpdateAnchor() yet at this point, and it seems if I don't
do this here, the view ends up anchored at (0,0). I am not 100% sure why this
is, since UpdateAnchor should get called soon after this constructor runs.

[tapted, 2016/05/11 07:06:18]

Sorry, I meant, instead of 

bubble_delegate_ = new PermissionsBubbleDialogDelegateView(
anchor_delegate_->GetAnchorView(), anchor_delegate_->GetAnchorPoint(),
GetAnchorArrow(), this, requests, values);

we should be able to do 

bubble_delegate_ = new PermissionsBubbleDialogDelegateView(this, requests,
values);
bubble_delegate_->UpdateAnchor(anchor_delegate_->GetAnchorView(),
anchor_delegate_->GetAnchorPoint(), GetAnchorArrow());

+
   set_close_on_deactivate(false);
 
   SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, 0, 0,
                                         kItemMajorSpacing));
 
   display_origin_ = url_formatter::FormatUrlForSecurityDisplay(
       requests[0]->GetOrigin(),
       url_formatter::SchemeDisplay::OMIT_CRYPTOGRAPHIC);
 
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
@@ skipping 155 matching lines @@
   frame->SetBubbleBorder(std::unique_ptr<views::BubbleBorder>(
       new views::BubbleBorder(adjusted_arrow, shadow(), color())));
 
   // Reposition the bubble based on the updated arrow and view.
   SetAnchorView(anchor_view);
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // PermissionBubbleViewViews
 
-PermissionBubbleViewViews::PermissionBubbleViewViews(Browser* browser)
+PermissionBubbleViewViews::PermissionBubbleViewViews(
+    Browser* browser,
+    std::unique_ptr<AnchorDelegate> anchor_delegate)
     : browser_(browser),
       delegate_(nullptr),
-      bubble_delegate_(nullptr) {
+      bubble_delegate_(nullptr),
+      anchor_delegate_(std::move(anchor_delegate)) {
   DCHECK(browser);
+  DCHECK(browser->window());
 }
 
 PermissionBubbleViewViews::~PermissionBubbleViewViews() {
 }
 
-// static
-std::unique_ptr<PermissionBubbleView> PermissionBubbleView::Create(
-    Browser* browser) {
-  return base::WrapUnique(new PermissionBubbleViewViews(browser));
-}
+// On Mac, there is a separate Cocoa-specific definition of this function.
+#if !defined(OS_MACOSX)

[tapted, 2016/05/03 12:02:39]

This approach won't work with the mac_views_browser build -- there we need to
anchor off a toolkit-views browser still, but on Mac. But once this is in its
own file, this should be easily doable with gyp variables

[Elly Fong-Jones, 2016/05/10 21:21:02]

Done.

I moved this class, and the CreateAnchorDelegate function, *and* the
PermissionBubbleView::Create views variant into a separate file, which I made
"non mac views".

+class ViewAnchorDelegate : public PermissionBubbleViewViews::AnchorDelegate {

[tapted, 2016/05/03 12:02:38]

Perhaps ViewsBrowserAnchorDelegate?

It should have a comment describing it too. Like

// Permits a toolkit-views permissions bubble to be anchored off a toolkit-views
BrowserView.

[Elly Fong-Jones, 2016/05/10 21:21:02]

Done.

+ public:
+  explicit ViewAnchorDelegate(Browser* browser);
+  ~ViewAnchorDelegate() override;
+  views::View* GetAnchorView() override;

[tapted, 2016/05/03 12:02:38]

nit: 
// AnchorDelegate:

[Elly Fong-Jones, 2016/05/10 21:21:02]

Done.

+  gfx::Point GetAnchorPoint() override;
+  gfx::NativeView GetParentView() override;
 
-views::View* PermissionBubbleViewViews::GetAnchorView() {
+ private:
+  Browser* browser_;
+};

[tapted, 2016/05/03 12:02:38]

nit: DISALLOW_COPY_AND_ASSIGN(..)

[Elly Fong-Jones, 2016/05/10 21:21:02]

Done.

+
+ViewAnchorDelegate::ViewAnchorDelegate(Browser* browser) : browser_(browser) {}
+
+ViewAnchorDelegate::~ViewAnchorDelegate() {}
+
+views::View* ViewAnchorDelegate::GetAnchorView() {
   BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser_);
 
   if (browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR))
     return browser_view->GetLocationBarView()->location_icon_view();
 
   if (browser_view->IsFullscreenBubbleVisible())
     return browser_view->exclusive_access_bubble()->GetView();
 
   return browser_view->top_container();
 }
 
+gfx::Point ViewAnchorDelegate::GetAnchorPoint() {
+  return gfx::Point();
+}
+
+gfx::NativeView ViewAnchorDelegate::GetParentView() {
+  views::Widget* widget = views::Widget::GetWidgetForNativeWindow(
+      browser_->window()->GetNativeWindow());
+  return widget->GetNativeView();
+}
+
+// static
+std::unique_ptr<PermissionBubbleView> PermissionBubbleView::Create(
+    Browser* browser) {
+  unique_ptr<ViewAnchorDelegate> anchor_delegate(browser);
+  return base::WrapUnique(
+      new PermissionBubbleViewViews(browser, std::move(anchor_delegate)));
+}
+
+#endif
+
+views::View* PermissionBubbleViewViews::GetAnchorView() {
+  return anchor_delegate_->GetAnchorView();
+}
+
+gfx::Point PermissionBubbleViewViews::GetAnchorPoint() {
+  return anchor_delegate_->GetAnchorPoint();
+}
+
 views::BubbleBorder::Arrow PermissionBubbleViewViews::GetAnchorArrow() {
   if (browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR))
     return views::BubbleBorder::TOP_LEFT;
   return views::BubbleBorder::NONE;
 }
 
 void PermissionBubbleViewViews::SetDelegate(Delegate* delegate) {
   delegate_ = delegate;
 }
 
 void PermissionBubbleViewViews::Show(
     const std::vector<PermissionBubbleRequest*>& requests,
     const std::vector<bool>& values) {
   if (bubble_delegate_)
     bubble_delegate_->CloseBubble();
 
   bubble_delegate_ = new PermissionsBubbleDialogDelegateView(
-      GetAnchorView(), GetAnchorArrow(), this, requests, values);
+      GetAnchorView(), GetAnchorPoint(), GetAnchorArrow(), this, requests,
+      values);
 
   // Set |parent_window| because some valid anchors can become hidden.
-  views::Widget* widget = views::Widget::GetWidgetForNativeWindow(
-      browser_->window()->GetNativeWindow());
-  bubble_delegate_->set_parent_window(widget->GetNativeView());
+  bubble_delegate_->set_parent_window(anchor_delegate_->GetParentView());

[tapted, 2016/05/03 12:02:38]

I don't think we need AnchorDelegate::GetParentView(), instead do:

platform_util::GetViewForWindow(browser_->window()->GetNativeWindow());

[Elly Fong-Jones, 2016/05/10 21:21:02]

Done.

 
   views::BubbleDialogDelegateView::CreateBubble(bubble_delegate_)->Show();
   bubble_delegate_->SizeToContents();
 }
 
 bool PermissionBubbleViewViews::CanAcceptRequestUpdate() {
   return !(bubble_delegate_ && bubble_delegate_->IsMouseHovered());
 }
 
 void PermissionBubbleViewViews::Hide() {
   if (bubble_delegate_) {
     bubble_delegate_->CloseBubble();
     bubble_delegate_ = nullptr;
   }
 }
 
 bool PermissionBubbleViewViews::IsVisible() {
   return bubble_delegate_ != nullptr;
 }
 
 void PermissionBubbleViewViews::UpdateAnchorPosition() {
   if (IsVisible())
     bubble_delegate_->UpdateAnchor(GetAnchorView(), GetAnchorArrow());

[tapted, 2016/05/03 12:02:39]

This needs to support a null AnchorView - probably by allowing an AnchorPoint to
be passed in to UpdateAnchor as well

[Elly Fong-Jones, 2016/05/10 21:21:02]

Done.

 }
 
 gfx::NativeWindow PermissionBubbleViewViews::GetNativeWindow() {
   if (bubble_delegate_ && bubble_delegate_->GetWidget())
     return bubble_delegate_->GetWidget()->GetNativeWindow();
   return nullptr;
 }
 
 void PermissionBubbleViewViews::Closing() {
   if (bubble_delegate_)
     bubble_delegate_ = nullptr;
   if (delegate_)
     delegate_->Closing();
 }
 
 void PermissionBubbleViewViews::Toggle(int index, bool value) {
   if (delegate_)
     delegate_->ToggleAccept(index, value);
 }
 
 void PermissionBubbleViewViews::Accept() {
   if (delegate_)
     delegate_->Accept();
 }
 
 void PermissionBubbleViewViews::Deny() {
   if (delegate_)
     delegate_->Deny();
 }