Implements a zoom icon in the Omnibox for Views.

chrome/browser/ui/views/location_bar/location_bar_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_LOCATION_BAR_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/search_engines/template_url_service_observer.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #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"
 #include "ui/gfx/rect.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/drag_controller.h"
 
 class ActionBoxButtonView;
 class ChromeToMobileView;
 class CommandUpdater;
 class ContentSettingBubbleModelDelegate;
 class ContentSettingImageView;
 class EVBubbleView;
 class ExtensionAction;
 class GURL;
 class InstantController;
 class KeywordHintView;
 class LocationIconView;
 class PageActionWithBadgeView;
 class PageActionImageView;
 class Profile;
 class SelectedKeywordView;
 class StarView;
 class SuggestedTextView;
 class TabContents;
 class TemplateURLService;
+class ZoomView;
 
 namespace views {
 class BubbleDelegateView;
 class Widget;
 }
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // LocationBarView class
 //
@@ skipping 106 matching lines @@
   Profile* profile() const { return profile_; }
 
   // Returns the delegate.
   Delegate* delegate() const { return delegate_; }
 
   // Sets |preview_enabled| for the PageAction View associated with this
   // |page_action|. If |preview_enabled| is true, the view will display the
   // PageActions icon even though it has not been activated by the extension.
   // This is used by the ExtensionInstalledBubble to preview what the icon
   // will look like for the user upon installation of the extension.
   void SetPreviewEnabledPageAction(ExtensionAction *page_action,

[Peter Kasting, 2012/06/26 23:23:39]

Nit: While you're here, can you fix the "*" location?

[Kyle Horimoto, 2012/06/30 00:22:50]

Done.

                                    bool preview_enabled);
 
   // Retrieves the PageAction View which is associated with |page_action|.
   views::View* GetPageActionView(ExtensionAction* page_action);
 
   // Toggles the star on or off.
   void SetStarToggled(bool on);
 
   // 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 these declarations/definitions
above SetPreviewEnabledPageAction(), since the actual zoom icon is listed before
the page action icons.

[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();
 
   // Returns the screen coordinates of the location entry (where the URL text
   // appears, not where the icons are shown).
   gfx::Point GetLocationEntryOrigin() const;
 
   // Invoked from OmniboxViewWin to show the instant suggestion.
   void SetInstantSuggestion(const string16& text,
                             bool animate_to_complete);
@@ skipping 241 matching lines @@
   // View responsible for showing suggested text. This is NULL when there is no
   // suggested text.
   SuggestedTextView* suggested_text_view_;
 
   // Shown if the selected url has a corresponding keyword.
   KeywordHintView* keyword_hint_view_;
 
   // The content setting views.
   ContentSettingViews content_setting_views_;
 
+  // The zoom icon.
+  ZoomView* zoom_view_;
+
   // The current page actions.
   std::vector<ExtensionAction*> page_actions_;
 
   // The page action icon views.
   PageActionViews page_action_views_;
 
   // The star.
   StarView* star_view_;
 
   // The action box button (plus).
@@ skipping 26 matching lines @@
   content::NotificationRegistrar registrar_;
 
   // The view to give focus to. This is either |this| or the
   // LocationBarContainer.
   views::View* view_to_focus_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_