[Password Manager] Close the bubble when fullscreen state gets change.

chrome/browser/ui/views/location_bar/zoom_bubble_view.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ZOOM_BUBBLE_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ZOOM_BUBBLE_VIEW_H_
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
+#include "chrome/browser/ui/views/managed_full_screen_bubble_delegate_view.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "extensions/browser/extension_icon_image.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/label.h"
 
 class FullscreenController;
 
 namespace content {
 class NotificationDetails;
 class NotificationSource;
 class WebContents;
 }
 
 namespace views {
 class ImageButton;
 }  // namespace views
 
 // View used to display the zoom percentage when it has changed.
-class ZoomBubbleView : public views::BubbleDelegateView,
+class ZoomBubbleView : public ManagedFullScreenBubbleDelegateView,
                        public views::ButtonListener,
-                       public content::NotificationObserver,
                        public ImmersiveModeController::Observer,
                        public extensions::IconImage::Observer {
  public:
   // Shows the bubble and automatically closes it after a short time period if
   // |auto_close| is true.
   static void ShowBubble(content::WebContents* web_contents,
                          bool auto_close);
 
   // Closes the showing bubble (if one exists).
   static void CloseBubble();
 
   // Whether the zoom bubble is currently showing.
   static bool IsShowing();
 
   // Returns the zoom bubble if the zoom bubble is showing. Returns NULL
   // otherwise.
   static const ZoomBubbleView* GetZoomBubbleForTest();
 
  private:
   FRIEND_TEST_ALL_PREFIXES(ZoomBubbleBrowserTest, ImmersiveFullscreen);
 
-  // Stores information about the extension that initiated the zoom change, if
-  // any.
-  struct ZoomBubbleExtensionInfo {
-    ZoomBubbleExtensionInfo();
-    ~ZoomBubbleExtensionInfo();
-
-    // The unique id of the extension, which is used to find the correct
-    // extension after clicking on the image button in the zoom bubble.
-    std::string id;
-
-    // The name of the extension, which appears in the tooltip of the image
-    // button in the zoom bubble.
-    std::string name;
-
-    // An image of the extension's icon, which appears in the zoom bubble as an
-    // image button.
-    scoped_ptr<const extensions::IconImage> icon_image;
-  };
-
   ZoomBubbleView(views::View* anchor_view,
                  content::WebContents* web_contents,
                  bool auto_close,
                  ImmersiveModeController* immersive_mode_controller,
                  FullscreenController* fullscreen_controller);
   ~ZoomBubbleView() 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::View methods.

[Peter Kasting, 2014/12/23 00:49:02]

Since you're trying to clean this stuff up anyway, please group together all
overrides that come from a single immediate parent.  This would mean not having
separate sections for views::View, views::BubbleDelegateView, or
ui::EventHandler, but instead putting those methods in whatever immediate parent
actually includes those classes in its own inheritance hierarchy.  Standardize
the comment above that section as just "ParentClassName:"

For example, let's say we have three parents A, B, C, and a child D:

class A {
  virtual void Method1();
  virtual void Method2();
};

class B {
  virtual void Method3();
};

class C : public A {
  // A:
  virtual void Method2();

  virtual void Method4();
};

class D : public B, public C {
  // First list any overrides from B in a section headed "B:"
  // Then list any overrides from C in a section headed "C:"
  //   Within the C section, list things first declared in A first,
  //   then things first declared in C
  // So you'd have something like the following:

  // B:
  virtual void Method3();

  // C:
  virtual void Method1();
  virtual void Method2();
  virtual void Method4();
};

[Pritam Nikam, 2014/12/23 06:22:29]

Done.

+  void OnMouseEntered(const ui::MouseEvent& event) override;
+  void OnMouseExited(const ui::MouseEvent& event) override;
+
+  // views::BubbleDelegateView method.
+  void Init() override;
+  void WindowClosing() override;
+
+  // ManagedFullScreenBubbleDelegateView:
+  using ManagedFullScreenBubbleDelegateView::AdjustForFullscreen;

[Peter Kasting, 2014/12/23 00:49:02]

Don't do this, just make the method public in the parent class.

[Pritam Nikam, 2014/12/23 06:22:29]

Done.

+  void Close() override;
+
+  // ui::EventHandler method.
+  void OnGestureEvent(ui::GestureEvent* event) override;
+
+  // views::ButtonListener method.
+  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
+
+  // ImmersiveModeController::Observer methods.
+  void OnImmersiveRevealStarted() override;
+  void OnImmersiveModeControllerDestroyed() override;
+
+  // extensions::IconImage::Observer overrides:
+  void OnExtensionIconImageChanged(extensions::IconImage* /* image */) override;
 
   // Refreshes the bubble by changing the zoom percentage appropriately and
   // resetting the timer if necessary.
   void Refresh();
 
-  void Close();
-
   // Sets information about the extension that initiated the zoom change.
   // Calling this method asserts that the extension |extension| did initiate
   // the zoom change.
   void SetExtensionInfo(const extensions::Extension* extension);
 
   // Starts a timer which will close the bubble if |auto_close_| is true.
   void StartTimerIfNecessary();
 
   // Stops the auto-close timer.
   void StopTimer();
 
-  // extensions::IconImage::Observer overrides:
-  void OnExtensionIconImageChanged(extensions::IconImage* /* image */) override;
+  // Stores information about the extension that initiated the zoom change, if
+  // any.
+  struct ZoomBubbleExtensionInfo {

[Peter Kasting, 2014/12/23 00:49:02]

Member structs/classes should probably go above methods (along with any typedefs
and enums, not that those are present here), like the order was previously.

[Pritam Nikam, 2014/12/23 06:22:29]

Done.

+    ZoomBubbleExtensionInfo();
+    ~ZoomBubbleExtensionInfo();
 
-  // views::View methods.
-  void OnMouseEntered(const ui::MouseEvent& event) override;
-  void OnMouseExited(const ui::MouseEvent& event) override;
+    // The unique id of the extension, which is used to find the correct
+    // extension after clicking on the image button in the zoom bubble.
+    std::string id;
 
-  // ui::EventHandler method.
-  void OnGestureEvent(ui::GestureEvent* event) override;
+    // The name of the extension, which appears in the tooltip of the image
+    // button in the zoom bubble.
+    std::string name;
 
-  // views::ButtonListener method.
-  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
-
-  // views::BubbleDelegateView method.
-  void Init() override;
-  void WindowClosing() override;
-
-  // content::NotificationObserver method.
-  void Observe(int type,
-               const content::NotificationSource& source,
-               const content::NotificationDetails& details) override;
-
-  // ImmersiveModeController::Observer methods.
-  void OnImmersiveRevealStarted() override;
-  void OnImmersiveModeControllerDestroyed() override;
+    // An image of the extension's icon, which appears in the zoom bubble as an
+    // image button.
+    scoped_ptr<const extensions::IconImage> icon_image;
+  };
 
   ZoomBubbleExtensionInfo extension_info_;
 
   // Singleton instance of the zoom bubble. The zoom bubble can only be shown on
   // the active browser window, so there is no case in which it will be shown
   // twice at the same time.
   static ZoomBubbleView* zoom_bubble_;
 
   // Timer used to close the bubble when |auto_close_| is true.
   base::OneShotTimer<ZoomBubbleView> timer_;
@@ skipping 10 matching lines @@
   content::WebContents* web_contents_;
 
   // Whether the currently displayed bubble will automatically close.
   bool auto_close_;
 
   // The immersive mode controller for the BrowserView containing
   // |web_contents_|.
   // Not owned.
   ImmersiveModeController* immersive_mode_controller_;
 
-  // Used to register for fullscreen change notifications.
-  content::NotificationRegistrar registrar_;
-
   DISALLOW_COPY_AND_ASSIGN(ZoomBubbleView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ZOOM_BUBBLE_VIEW_H_