Implements a zoom icon in the Omnibox for Views.

chrome/browser/ui/views/location_bar/location_bar_view.cc

 // 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.
 
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/stl_util.h"
@@ skipping 30 matching lines @@
 #include "chrome/browser/ui/views/location_bar/chrome_to_mobile_view.h"
 #include "chrome/browser/ui/views/location_bar/content_setting_image_view.h"
 #include "chrome/browser/ui/views/location_bar/ev_bubble_view.h"
 #include "chrome/browser/ui/views/location_bar/keyword_hint_view.h"
 #include "chrome/browser/ui/views/location_bar/location_icon_view.h"
 #include "chrome/browser/ui/views/location_bar/page_action_image_view.h"
 #include "chrome/browser/ui/views/location_bar/page_action_with_badge_view.h"
 #include "chrome/browser/ui/views/location_bar/selected_keyword_view.h"
 #include "chrome/browser/ui/views/location_bar/star_view.h"
 #include "chrome/browser/ui/views/location_bar/suggested_text_view.h"
+#include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h"
+#include "chrome/browser/ui/views/location_bar/zoom_view.h"
 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
 #include "chrome/browser/ui/views/omnibox/omnibox_views.h"
 #include "chrome/browser/ui/webui/instant_ui.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_switch_utils.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 110 matching lines @@
       disposition_(CURRENT_TAB),
       transition_(content::PageTransitionFromInt(
           content::PAGE_TRANSITION_TYPED |
           content::PAGE_TRANSITION_FROM_ADDRESS_BAR)),
       location_icon_view_(NULL),
       ev_bubble_view_(NULL),
       location_entry_view_(NULL),
       selected_keyword_view_(NULL),
       suggested_text_view_(NULL),
       keyword_hint_view_(NULL),
+      zoom_view_(NULL),
       star_view_(NULL),
       action_box_button_view_(NULL),
       chrome_to_mobile_view_(NULL),
       mode_(mode),
       show_focus_rect_(false),
       template_url_service_(NULL),
       animation_offset_(0),
       ALLOW_THIS_IN_INITIALIZER_LIST(view_to_focus_(this)) {
   set_id(VIEW_ID_LOCATION_BAR);
 
@@ skipping 70 matching lines @@
   keyword_hint_view_->SetFont(font_);
 
   for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) {
     ContentSettingImageView* content_blocked_view =
         new ContentSettingImageView(static_cast<ContentSettingsType>(i), this);
     content_setting_views_.push_back(content_blocked_view);
     AddChildView(content_blocked_view);
     content_blocked_view->SetVisible(false);
   }
 
+  zoom_view_ = new ZoomView(model_);
+  AddChildView(zoom_view_);
+
   if (extensions::switch_utils::IsActionBoxEnabled()) {
     action_box_button_view_ = new ActionBoxButtonView(
         ExtensionSystem::Get(profile_)->extension_service());
     AddChildView(action_box_button_view_);
   } else if (browser_defaults::bookmarks_enabled && (mode_ == NORMAL)) {
     // Note: condition above means that the star and ChromeToMobile icons are
     // hidden in popups and in the app launcher.
     star_view_ = new StarView(command_updater_);
     AddChildView(star_view_);
     star_view_->SetVisible(true);
@@ skipping 102 matching lines @@
     // Fade in so the icons don't pop.
     StartFadeAnimation();
   } else {
     // Cancel any pending animations; switch to the final state immediately.
     StopFadeAnimation();
   }
 #endif
 }
 
 void LocationBarView::Update(const WebContents* tab_for_state_restoring) {
+  RefreshContentSettingViews();
+  zoom_view_->Update();
+  RefreshPageActionViews();
+
   bool star_enabled = star_view_ && !model_->input_in_progress() &&
                       edit_bookmarks_enabled_.GetValue();
 
   command_updater_->UpdateCommandEnabled(IDC_BOOKMARK_PAGE, star_enabled);
   if (star_view_)
     star_view_->SetVisible(star_enabled);
 
   bool enabled = chrome_to_mobile_view_ && !model_->input_in_progress() &&
       ChromeToMobileServiceFactory::GetForProfile(profile_)->HasDevices();
   command_updater_->UpdateCommandEnabled(IDC_CHROME_TO_MOBILE_PAGE, enabled);
 
-  RefreshContentSettingViews();
-  RefreshPageActionViews();
   // Don't Update in app launcher mode so that the location entry does not show
   // a URL or security background.
   if (mode_ != APP_LAUNCHER)
     location_entry_->Update(tab_for_state_restoring);
   OnChanged();
 }
 
 void LocationBarView::UpdateContentSettingsIcons() {
   RefreshContentSettingViews();
 
@@ skipping 72 matching lines @@
 
 void LocationBarView::SetStarToggled(bool on) {
   if (star_view_)
     star_view_->SetToggled(on);
 }
 
 void LocationBarView::ShowStarBubble(const GURL& url, bool newly_bookmarked) {
   browser::ShowBookmarkBubbleView(star_view_, profile_, url, newly_bookmarked);
 }
 
+void LocationBarView::SetZoomIconTooltipPercent(int zoom_percent) {
+  zoom_view_->SetZoomIconTooltipPercent(zoom_percent);
+}
+
+void LocationBarView::SetZoomIconState(
+    ZoomController::ZoomIconState zoom_icon_state) {
+  zoom_view_->SetZoomIconState(zoom_icon_state);
+}
+
+void LocationBarView::ShowZoomBubble(int zoom_percent) {
+  ZoomBubbleView::ShowBubble(zoom_view_, zoom_percent, true);
+}
+
 void LocationBarView::ShowChromeToMobileBubble() {
   Browser* browser = GetBrowserFromDelegate(delegate_);
   browser::ShowChromeToMobileBubbleView(chrome_to_mobile_view_, browser);
 }
 
 gfx::Point LocationBarView::GetLocationEntryOrigin() const {
   gfx::Point origin(location_entry_view_->bounds().origin());
   // If the UI layout is RTL, the coordinate system is not transformed and
   // therefore we need to adjust the X coordinate so that bubble appears on the
   // right hand side of the location bar.
@@ skipping 118 matching lines @@
     // We'll adjust this width and take it out of |entry_width| below.
   } else {
     location_icon_view_->SetVisible(true);
     location_icon_width = location_icon_view_->GetPreferredSize().width();
     entry_width -= (kEdgeThickness + GetEdgeItemPadding() +
                     location_icon_width + kItemEditPadding);
   }
 
   if (star_view_ && star_view_->visible())
     entry_width -= star_view_->GetPreferredSize().width() + GetItemPadding();
-  if (chrome_to_mobile_view_ && chrome_to_mobile_view_->visible())
+  if (chrome_to_mobile_view_ && chrome_to_mobile_view_->visible()) {
     entry_width -= chrome_to_mobile_view_->GetPreferredSize().width() +
         GetItemPadding();
+  }
   int action_box_button_width = location_height;
   if (action_box_button_view_)
     entry_width -= action_box_button_width + GetItemPadding();
   for (PageActionViews::const_iterator i(page_action_views_.begin());
        i != page_action_views_.end(); ++i) {
     if ((*i)->visible())
       entry_width -= ((*i)->GetPreferredSize().width() + GetItemPadding());
   }
+  entry_width -= zoom_view_->GetPreferredSize().width() + GetItemPadding();

[Peter Kasting, 2012/07/02 19:21:27]

This should only happen if the zoom icon is visible, lest we leave an empty gap.

[Kyle Horimoto, 2012/07/02 21:09:02]

Done.

   for (ContentSettingViews::const_iterator i(content_setting_views_.begin());
        i != content_setting_views_.end(); ++i) {
     if ((*i)->visible())
       entry_width -= ((*i)->GetPreferredSize().width() + GetItemPadding());
   }
   // The gap between the edit and whatever is to its right is shortened.
   entry_width += kEditInternalSpace;
 
   // Size the EV bubble after taking star/ChromeToMobile/page actions/content
   // settings out of |entry_width| so we won't take too much space.
@@ skipping 74 matching lines @@
   for (PageActionViews::const_iterator i(page_action_views_.begin());
        i != page_action_views_.end(); ++i) {
     if ((*i)->visible()) {
       offset += (*i)->GetBuiltInHorizontalPadding();
       int page_action_width = (*i)->GetPreferredSize().width();
       offset -= page_action_width;
       (*i)->SetBounds(offset, location_y, page_action_width, location_height);
       offset -= GetItemPadding() - (*i)->GetBuiltInHorizontalPadding();
     }
   }
+
+  int zoom_width = zoom_view_->GetPreferredSize().width();

[Peter Kasting, 2012/07/02 19:21:27]

This block should only happen if the zoom icon is visible, lest we leave an
empty gap.

[Kyle Horimoto, 2012/07/02 21:09:02]

Done.

+  offset -= zoom_width;
+  zoom_view_->SetBounds(offset, location_y, zoom_width, location_height);
+  offset -= GetItemPadding();
+
   // We use a reverse_iterator here because we're laying out the views from
   // right to left but in the vector they're ordered left to right.
   for (ContentSettingViews::const_reverse_iterator
        i(content_setting_views_.rbegin()); i != content_setting_views_.rend();
        ++i) {
     if ((*i)->visible()) {
       offset += (*i)->GetBuiltInHorizontalPadding();
       int content_blocked_width = (*i)->GetPreferredSize().width();
       offset -= content_blocked_width;
       (*i)->SetBounds(offset, location_y, content_blocked_width,
@@ skipping 706 matching lines @@
 }
 
 void LocationBarView::CleanupFadeAnimation() {
   // Since we're no longer animating we don't need our layer.
   SetPaintToLayer(false);
   // Bubble labels don't need a transparent background anymore.
   ev_bubble_view_->SetLabelBackgroundColor(SK_ColorWHITE);
   selected_keyword_view_->SetLabelBackgroundColor(SK_ColorWHITE);
 }
 #endif  // USE_AURA