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

Unified Diff: chrome/browser/ui/website_settings/permission_bubble_manager.h

Issue 1251633002: Add BubbleManager to manage bubbles and ChromeBubbleManager for events. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Kill views_bubble_controller Created 5 years, 5 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/website_settings/permission_bubble_manager.h
diff --git a/chrome/browser/ui/website_settings/permission_bubble_manager.h b/chrome/browser/ui/website_settings/permission_bubble_manager.h
index 72cf461eb856b493c0ab2d1300068e5fd5458115..b76fb7ef5e3ecdcc2ad09448e55e494464fa50d6 100644
--- a/chrome/browser/ui/website_settings/permission_bubble_manager.h
+++ b/chrome/browser/ui/website_settings/permission_bubble_manager.h
@@ -14,7 +14,10 @@
#include "content/public/browser/web_contents_observer.h"
#include "content/public/browser/web_contents_user_data.h"
+class PermissionBubbleDelegate;
class PermissionBubbleRequest;
+class BubbleDelegate;
+class BubbleManager;
// Provides access to permissions bubbles. Allows clients to add a request
// callback interface to the existing permission bubble configuration.
@@ -112,6 +115,7 @@ class PermissionBubbleManager
friend class GeolocationPermissionContextParamTests;
friend class MockPermissionBubbleView;
friend class PermissionBubbleManagerTest;
+ friend class PermissionBubbleDelegate;
friend class PermissionContextBaseTests;
friend class content::WebContentsUserData<PermissionBubbleManager>;
FRIEND_TEST_ALL_PREFIXES(DownloadTest, TestMultipleDownloadsBubble);
@@ -173,11 +177,11 @@ class PermissionBubbleManager
// False by default, unless RequireUserGesture(bool) changes the value.
bool require_user_gesture_;
- // Factory to be used to create views when needed.
- PermissionBubbleView::Factory view_factory_;
+ // Delegate for permission bubbles.
+ scoped_ptr<BubbleDelegate> bubble_delegate_;
- // The UI surface to be used to display the permissions requests.
- scoped_ptr<PermissionBubbleView> view_;
+ // The bubble_manager_ that the bubble_delegate_ is shown in. Weak.
+ BubbleManager* bubble_manager_;
std::vector<PermissionBubbleRequest*> requests_;
std::vector<PermissionBubbleRequest*> queued_requests_;

Powered by Google App Engine
This is Rietveld 408576698