chrome/browser/ui/views/location_bar/location_bar_view.h - Issue 10494004: Implements a zoom icon in the Omnibox for Views.

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: Addressed comments, improved code executed when a new bubble is opened when another already exists Created 8 years, 6 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

« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | chrome/browser/ui/views/location_bar/location_bar_view.cc » ('j') | chrome/browser/ui/views/location_bar/location_bar_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 29a185e363bd42bf947c6d3af6735b86deae4e7d..196df72c07e3d845f9e1aa59720beed6a1f9c735 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"

@@ -45,6 +46,7 @@ class StarView;

class SuggestedTextView;

class TabContents;

class TemplateURLService;

+class ZoomView;

namespace views {

class BubbleDelegateView;

@@ -183,6 +185,15 @@ class LocationBarView : public LocationBar,

// Shows the bookmark bubble.

void ShowStarBubble(const GURL& url, bool newly_bookmarked);

+ // Sets the tooltip for the zoom icon.

Peter Kasting 2012/06/26 23:23:39 Tiny nit: For ordering consistency, let's move the

Kyle Horimoto 2012/06/30 00:22:50 Done.

+ void SetZoomIconTooltipPercent(int zoom_percent);

+ // Sets the zoom icon state.

+ void SetZoomIconState(ZoomController::ZoomIconState zoom_icon_state);

+ // Show the zoom bubble.

Peter Kasting 2012/06/26 23:23:39 Nit: Show -> Shows

Kyle Horimoto 2012/06/30 00:22:50 Done.

+ void ShowZoomBubble(int zoom_percent);

// Shows the Chrome To Mobile bubble.

void ShowChromeToMobileBubble();

@@ -444,6 +455,9 @@ class LocationBarView : public LocationBar,

// The content setting views.

ContentSettingViews content_setting_views_;

+ // The zoom icon.

+ ZoomView* zoom_view_;

// The current page actions.

std::vector<ExtensionAction*> page_actions_;