Updates Zoom bubble layout and adds +/- buttons

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/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/timer/timer.h"
@@ skipping 63 matching lines @@
   // when |reason| is AUTOMATIC. If |immersive_mode_controller_| is present, the
   // bubble will auto-close when the top-of-window views are revealed.
   ZoomBubbleView(views::View* anchor_view,
                  const gfx::Point& anchor_point,
                  content::WebContents* web_contents,
                  DisplayReason reason,
                  ImmersiveModeController* immersive_mode_controller);
   ~ZoomBubbleView() override;
 
   // LocationBarBubbleDelegateView:
+  gfx::Size GetPreferredSize() const override;
   void OnGestureEvent(ui::GestureEvent* event) override;
   void OnMouseEntered(const ui::MouseEvent& event) override;
   void OnMouseExited(const ui::MouseEvent& event) override;
   void Init() override;
   void WindowClosing() override;
   void CloseBubble() override;
+  bool ShouldSnapFrameWidth() const override;
 
   // views::ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
   // ImmersiveModeController::Observer:
   void OnImmersiveRevealStarted() override;
   void OnImmersiveModeControllerDestroyed() override;
 
   // extensions::IconImage::Observer:
   void OnExtensionIconImageChanged(extensions::IconImage* /* image */) override;
 
   // 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);
 
+  // Updates |label_| with the up to date zoom.
+  void UpdateZoomPercent();
+
   // Starts a timer which will close the bubble if |auto_close_| is true.
   void StartTimerIfNecessary();
 
   // Stops the auto-close timer.
   void StopTimer();
 
   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 auto close the bubble.
   base::OneShotTimer timer_;
 
+  // Timer duration that is made longer if a user presses + or - buttons.
+  base::TimeDelta auto_close_duration_;
+
   // Image button in the zoom bubble that will show the |extension_icon_| image
   // if an extension initiated the zoom change, and links to that extension at
   // "chrome://extensions".
   views::ImageButton* image_button_;
 
   // Label displaying the zoom percentage.
   views::Label* label_;
 
+  // Action buttons that can change zoom.
+  views::Button* zoom_out_button_;
+  views::Button* zoom_in_button_;
+  views::Button* reset_button_;
+
   // The WebContents for the page whose zoom has changed.
   content::WebContents* web_contents_;
 
   // Whether the currently displayed bubble will automatically close.
   bool auto_close_;
 
+  // True when handling a button click event.

[Peter Kasting, 2017/05/05 23:50:40]

Nit: Maybe "Used to ignore close requests generated automatically in response to
button presses, since pressing a button in the bubble should not trigger
closing."

[varkha, 2017/05/15 22:34:42]

Done.

+  bool ignore_close_bubble_;
+
   // The immersive mode controller for the BrowserView containing
   // |web_contents_|.
   // Not owned.
   ImmersiveModeController* immersive_mode_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(ZoomBubbleView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ZOOM_BUBBLE_VIEW_H_