Chromium Code Reviews| Index: chrome/browser/ui/views/website_settings/permissions_bubble_view.h |
| diff --git a/chrome/browser/ui/views/website_settings/permissions_bubble_view.h b/chrome/browser/ui/views/website_settings/permissions_bubble_view.h |
| index a9d1836c07edb89ff161e81496c7522398ed61c9..ffed592ee7be612a8c5705af1d0d49aead1d89ac 100644 |
| --- a/chrome/browser/ui/views/website_settings/permissions_bubble_view.h |
| +++ b/chrome/browser/ui/views/website_settings/permissions_bubble_view.h |
| @@ -9,7 +9,7 @@ |
| #include "base/compiler_specific.h" |
| #include "base/macros.h" |
| -#include "chrome/browser/ui/website_settings/permission_bubble_view.h" |
| +#include "components/bubble/bubble_ui.h" |
| #include "ui/views/bubble/bubble_border.h" |
| namespace views { |
| @@ -17,23 +17,21 @@ class View; |
| } |
| class Browser; |
| +class PermissionBubbleManager; |
| class PermissionsBubbleDelegateView; |
| -class PermissionBubbleViewViews : public PermissionBubbleView { |
| +class PermissionBubbleViewViews : public BubbleUI { |
| public: |
| - explicit PermissionBubbleViewViews(Browser* browser); |
| + explicit PermissionBubbleViewViews(PermissionBubbleManager* manager); |
| ~PermissionBubbleViewViews() override; |
| - // PermissionBubbleView: |
| - void SetDelegate(Delegate* delegate) override; |
| - void Show(const std::vector<PermissionBubbleRequest*>& requests, |
| - const std::vector<bool>& accept_state) override; |
| - bool CanAcceptRequestUpdate() override; |
| + // BubbleUI |
|
msw
2015/08/13 03:37:21
nit: trailing colon
|
| + void Show() override; |
| void Hide() override; |
| - bool IsVisible() override; |
| void UpdateAnchorPosition() override; |
| - gfx::NativeWindow GetNativeWindow() override; |
| + bool CanAcceptUpdate() const override; |
| + // Callbacks from UI: |
| void Closing(); |
| void Toggle(int index, bool value); |
| void Accept(); |
| @@ -43,9 +41,9 @@ class PermissionBubbleViewViews : public PermissionBubbleView { |
| views::View* GetAnchorView(); |
| views::BubbleBorder::Arrow GetAnchorArrow(); |
| - Browser* browser_; |
| - Delegate* delegate_; |
| - PermissionsBubbleDelegateView* bubble_delegate_; |
| + PermissionBubbleManager* manager_; // Weak. |
| + Browser* browser_; // Weak. |
| + PermissionsBubbleDelegateView* bubble_delegate_; // Weak. |
| DISALLOW_COPY_AND_ASSIGN(PermissionBubbleViewViews); |
| }; |