Chromium Code Reviews| Index: chrome/browser/ui/views/passwords/manage_passwords_bubble_view.h |
| diff --git a/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.h b/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.h |
| index f888b356474986b8a62c83213896c7a35527207d..18ffb6f17a5ed90ca42957e79b663d2ef8d07dd9 100644 |
| --- a/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.h |
| +++ b/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.h |
| @@ -6,9 +6,7 @@ |
| #define CHROME_BROWSER_UI_VIEWS_PASSWORDS_MANAGE_PASSWORDS_BUBBLE_VIEW_H_ |
| #include "chrome/browser/ui/passwords/manage_passwords_bubble.h" |
| -#include "content/public/browser/notification_observer.h" |
| -#include "content/public/browser/notification_registrar.h" |
| -#include "ui/views/bubble/bubble_delegate.h" |
| +#include "chrome/browser/ui/views/managed_full_screen_bubble_delegate_view.h" |
| class ManagePasswordsIconView; |
| @@ -25,8 +23,7 @@ class WebContents; |
| // 3. BlacklistedView: Informs the user that the current page is blacklisted. |
| // |
| class ManagePasswordsBubbleView : public ManagePasswordsBubble, |
| - public views::BubbleDelegateView, |
| - public content::NotificationObserver { |
| + public ManagedFullScreenBubbleDelegateView { |
| public: |
| // Shows the bubble. |
| static void ShowBubble(content::WebContents* web_contents, |
| @@ -67,14 +64,16 @@ class ManagePasswordsBubbleView : public ManagePasswordsBubble, |
| DisplayReason reason); |
| ~ManagePasswordsBubbleView() override; |
| - // If the bubble is not anchored to a view, places the bubble in the top |
| - // right (left in RTL) of the |screen_bounds| that contain |web_contents_|'s |
| - // browser window. Because the positioning is based on the size of the |
| - // bubble, this must be called after the bubble is created. |
| - void AdjustForFullscreen(const gfx::Rect& screen_bounds); |
| + // views::WidgetDelegate: |
|
Peter Kasting
2014/12/23 00:49:03
Same comments regarding override groups.
Pritam Nikam
2014/12/23 06:22:29
Done.
|
| + views::View* GetInitiallyFocusedView() override; |
| + |
| + // views::BubbleDelegateView: |
| + void Init() override; |
| + void WindowClosing() override; |
| - // Close the bubble. |
| - void Close(); |
| + // ManagedFullScreenBubbleDelegateView: |
| + using ManagedFullScreenBubbleDelegateView::AdjustForFullscreen; |
|
Peter Kasting
2014/12/23 00:49:03
Again, don't do this.
Pritam Nikam
2014/12/23 06:22:29
Done.
|
| + void Close() override; |
| // Refreshes the bubble's state: called to display a confirmation screen after |
| // a user selects "Never for this site", for instance. |
| @@ -92,18 +91,6 @@ class ManagePasswordsBubbleView : public ManagePasswordsBubble, |
| // undo the action and refresh to PendingView. |
| void NotifyUndoNeverForThisSite(); |
| - // views::BubbleDelegateView: |
| - void Init() override; |
| - void WindowClosing() override; |
| - |
| - // views::WidgetDelegate: |
| - views::View* GetInitiallyFocusedView() override; |
| - |
| - // content::NotificationObserver: |
| - void Observe(int type, |
| - const content::NotificationSource& source, |
| - const content::NotificationDetails& details) override; |
| - |
| void set_initially_focused_view(views::View* view) { |
| DCHECK(!initially_focused_view_); |
| initially_focused_view_ = view; |
| @@ -123,9 +110,6 @@ class ManagePasswordsBubbleView : public ManagePasswordsBubble, |
| class WebContentMouseHandler; |
| scoped_ptr<WebContentMouseHandler> mouse_handler_; |
| - // Used to register for fullscreen change notifications. |
| - content::NotificationRegistrar registrar_; |
| - |
| DISALLOW_COPY_AND_ASSIGN(ManagePasswordsBubbleView); |
| }; |