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

Unified Diff: chrome/browser/ui/views/location_bar/location_bar_view.h

Issue 10494004: Implements a zoom icon in the Omnibox for Views. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 7 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/views/location_bar/location_bar_view.h
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h
index 588106db3083df829c36e3d85da2eb0c0bdb5352..f5a774be9a171731ee9cce2890a130a0067449cc 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.h
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.h
@@ -19,6 +19,7 @@
#include "chrome/browser/ui/views/dropdown_bar_host.h"
#include "chrome/browser/ui/views/dropdown_bar_host_delegate.h"
#include "chrome/browser/ui/views/extensions/extension_popup.h"
+#include "chrome/browser/ui/zoom/zoom_controller.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
#include "ui/gfx/font.h"
@@ -48,6 +49,7 @@ class PageActionImageView;
class Profile;
class SelectedKeywordView;
class StarView;
+class ZoomView;
class TabContentsWrapper;
class TemplateURLService;
@@ -190,6 +192,15 @@ class LocationBarView : public LocationBar,
// Shows the bookmark bubble.
void ShowStarBubble(const GURL& url, bool newly_bookmarked);
+ // Sets the tooltip for the zoom icon.
+ void SetZoomIconTooltipPercent(int zoom_percent);
+
+ // Sets the zoom icon state.
+ void SetZoomIconState(ZoomController::ZoomIconState zoom_icon_state);
+
+ // Show the zoom bubble.
+ void ShowZoomBubble(int zoom_percent);
+
// Shows the Chrome To Mobile bubble.
void ShowChromeToMobileBubble();
@@ -465,6 +476,9 @@ class LocationBarView : public LocationBar,
// The star.
StarView* star_view_;
+ // The zoom icon.
+ ZoomView* zoom_view_;
+
// The action box button (plus).
ActionBoxButtonView* action_box_button_view_;

Powered by Google App Engine
This is Rietveld 408576698