Add BubbleManager to manage bubbles and ChromeBubbleManager for events.

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 "base/prefs/pref_service.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"
 #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_delegate.h"
 #include "chrome/browser/ui/website_settings/permission_bubble_request.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/url_formatter/url_formatter.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/text_constants.h"
@@ skipping 371 matching lines @@
   frame->SetBubbleBorder(scoped_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)
-    : browser_(browser),
-      delegate_(nullptr),
-      bubble_delegate_(nullptr) {
-  DCHECK(browser);
+PermissionBubbleViewViews::PermissionBubbleViewViews(
+    PermissionBubbleDelegate* delegate)
+    : delegate_(delegate), bubble_delegate_(nullptr) {
+  DCHECK(delegate);
 }
 
 PermissionBubbleViewViews::~PermissionBubbleViewViews() {
 }
 
 // static
-scoped_ptr<PermissionBubbleView> PermissionBubbleView::Create(
-    Browser* browser) {
-  return make_scoped_ptr(new PermissionBubbleViewViews(browser));
+scoped_ptr<BubbleUI> PermissionBubbleView::Create(
+    PermissionBubbleDelegate* delegate) {
+  return make_scoped_ptr(new PermissionBubbleViewViews(delegate));
 }
 
 views::View* PermissionBubbleViewViews::GetAnchorView() {

[groby-ooo-7-16, 2015/08/06 21:32:56]

Once we have a Cocoa version, too, let's see how much of this code can be
shared. Getting the anchor view should be a fairly platform-neutral exercise,
ideally.

[hcarmona, 2015/08/07 02:12:58]

Sounds good

-  BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser_);
+  BrowserView* browser_view =
+      BrowserView::GetBrowserViewForBrowser(delegate_->browser());
 
-  if (browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR))
+  if (delegate_->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();
 }
 
 views::BubbleBorder::Arrow PermissionBubbleViewViews::GetAnchorArrow() {
-  if (browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR))
+  if (delegate_->browser()->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR))
     return views::BubbleBorder::TOP_LEFT;
   return views::BubbleBorder::NONE;
 }
 
-void PermissionBubbleViewViews::SetDelegate(Delegate* delegate) {
+void PermissionBubbleViewViews::SetDelegate(
+    PermissionBubbleDelegate* delegate) {
   delegate_ = delegate;
 }
 
-void PermissionBubbleViewViews::Show(
-    const std::vector<PermissionBubbleRequest*>& requests,
-    const std::vector<bool>& values) {
+void PermissionBubbleViewViews::Show() {
   if (bubble_delegate_)
     bubble_delegate_->Close();
 
-  bubble_delegate_ =
-      new PermissionsBubbleDelegateView(
-          GetAnchorView(), GetAnchorArrow(), this,
-          browser_->profile()->GetPrefs()->GetString(prefs::kAcceptLanguages),
-          requests, values);
+  bubble_delegate_ = new PermissionsBubbleDelegateView(
+      GetAnchorView(), GetAnchorArrow(), this,
+      delegate_->browser()->profile()->GetPrefs()->GetString(
+          prefs::kAcceptLanguages),
+      delegate_->requests(), delegate_->accept_states());
 
   // Set |parent_window| because some valid anchors can become hidden.
   views::Widget* widget = views::Widget::GetWidgetForNativeWindow(
-      browser_->window()->GetNativeWindow());
+      delegate_->browser()->window()->GetNativeWindow());
   bubble_delegate_->set_parent_window(widget->GetNativeView());
 
   views::BubbleDelegateView::CreateBubble(bubble_delegate_)->Show();
   bubble_delegate_->SizeToContents();
 }
 
 bool PermissionBubbleViewViews::CanAcceptRequestUpdate() {
   return !(bubble_delegate_ && bubble_delegate_->IsMouseHovered());
 }
 
 void PermissionBubbleViewViews::Hide() {

[groby-ooo-7-16, 2015/08/06 21:32:56]

Ideally, nobody calls Hide here any more - that should move onto the
BubbleController. That's the ultimate goal of all this, most code just has a
BubbleController and doesn't care about the specific type any more. Same goes
for IsVisible, UpdateAnchorPosition, etc. 

We'll probably have to wait till the Cocoa version is ready, but
PermissionBubbleView should really shrink quite a bit, containing only things
highly specific to PermissionBubbles

[Edit: It looks like PermissionBubbleView doesn't have the Hide() API any more,
so isn't this code superfluous?)

[hcarmona, 2015/08/07 02:12:58]

Show, Hide and UpdateAnchorPosition are part of BubbleUI, so the
BubbleController calls them directly. I haven't looked at the exact
differences between show/hide/update in views and cocoa.

   if (bubble_delegate_) {
     bubble_delegate_->Close();
     bubble_delegate_ = nullptr;
   }
 }
 
 bool PermissionBubbleViewViews::IsVisible() {
   return bubble_delegate_ != nullptr;
 }
 
@@ skipping 22 matching lines @@
 
 void PermissionBubbleViewViews::Accept() {
   if (delegate_)
     delegate_->Accept();
 }
 
 void PermissionBubbleViewViews::Deny() {
   if (delegate_)
     delegate_->Deny();
 }