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/command_line.h"
@@ skipping 24 matching lines @@
 #include "chrome/browser/ui/views/location_bar/action_box_button_view.h"
 #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/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/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"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
@@ skipping 86 matching lines @@
           content::PAGE_TRANSITION_FROM_ADDRESS_BAR)),
       location_icon_view_(NULL),
       ev_bubble_view_(NULL),
       location_entry_view_(NULL),
       selected_keyword_view_(NULL),
 #if defined(OS_WIN) || defined(USE_AURA)
       suggested_text_view_(NULL),
 #endif
       keyword_hint_view_(NULL),
       star_view_(NULL),
+      zoom_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) {
   set_id(VIEW_ID_LOCATION_BAR);
 
   if (mode_ == NORMAL) {
     painter_.reset(
@@ skipping 78 matching lines @@
     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);
 
+    zoom_view_ = new ZoomView();

[Peter Kasting, 2012/06/22 20:16:20]

This should appear in the same cases as the content settings icons.  I think
those appear in popup and app windows show I think we should create this
unconditionally.

[Kyle Horimoto, 2012/06/26 21:55:53]

Done. Moved below the code adding the Star, etc. in order to preserve the
correct order.

+    AddChildView(zoom_view_);
+
     // Also disable Chrome To Mobile for off-the-record and non-synced profiles,
     // or if the feature is disabled by a command line flag or chrome://flags.
     if (!profile_->IsOffTheRecord() && profile_->IsSyncAccessible() &&
         ChromeToMobileService::IsChromeToMobileEnabled()) {
       chrome_to_mobile_view_ = new ChromeToMobileView(this, command_updater_);
       AddChildView(chrome_to_mobile_view_);
       ChromeToMobileService* service =
           ChromeToMobileServiceFactory::GetForProfile(profile_);
       service->RequestMobileListUpdate();
       chrome_to_mobile_view_->SetVisible(service->HasDevices());
@@ skipping 85 matching lines @@
   animation_offset_ = offset;
 }
 
 void LocationBarView::Update(const WebContents* tab_for_state_restoring) {
   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);
 
+  zoom_view_->Update();
+  if (model_->input_in_progress())
+    zoom_view_->SetVisible(false);

[Peter Kasting, 2012/06/22 20:16:20]

Doesn't this need to be:

  zoom_view_->SetVisible(!model_->input_in_progress());

...so that it reappears once editing is done?

[Kyle Horimoto, 2012/06/26 21:55:53]

Moved this check to ZoomView::Update() :)

+
   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);
@@ skipping 80 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) {
+  if (zoom_view_)

[Peter Kasting, 2012/06/22 20:16:20]

NULL-check no longer needed once this is created unconditionally (see above).

[Kyle Horimoto, 2012/06/26 21:55:53]

Done.

+    zoom_view_->SetZoomIconTooltipPercent(zoom_percent);
+}
+
+void LocationBarView::SetZoomIconState(
+    ZoomController::ZoomIconState zoom_icon_state) {
+  if (zoom_view_) {
+    zoom_view_->SetZoomIconState(zoom_icon_state);
+    UpdateContentSettingsIcons();

[Peter Kasting, 2012/06/22 20:16:20]

Why are we calling this?

Did you instead mean to just do Layout(); SchedulePaint(); ?

[Kyle Horimoto, 2012/06/26 21:55:53]

Hmm, I think this is part of some code I ended up removing. Sorry about that :/

+  }
+}
+
+void LocationBarView::ShowZoomBubble(int zoom_percent) {
+  if (zoom_view_)
+    ZoomBubbleView::ShowBubble(zoom_view_, zoom_percent, true);
+}
+
 void LocationBarView::ShowChromeToMobileBubble() {
   browser::ShowChromeToMobileBubbleView(chrome_to_mobile_view_, profile_);
 }
 
 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.
   if (base::i18n::IsRTL())
@@ skipping 108 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 (zoom_view_ && zoom_view_->visible())

[Peter Kasting, 2012/06/22 20:16:20]

Nit: Remove NULL-check and move to appropriate location (2 places)

[Kyle Horimoto, 2012/06/26 21:55:53]

Done.

+    entry_width -= zoom_view_->GetPreferredSize().width() + GetItemPadding();
   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());
@@ skipping 64 matching lines @@
     offset -= GetEdgeItemPadding();
   }
 
   if (star_view_ && star_view_->visible()) {
     int star_width = star_view_->GetPreferredSize().width();
     offset -= star_width;
     star_view_->SetBounds(offset, location_y, star_width, location_height);
     offset -= GetItemPadding();
   }
 
+  if (zoom_view_ && zoom_view_->visible()) {
+    int zoom_width = zoom_view_->GetPreferredSize().width();
+    offset -= zoom_width;
+    zoom_view_->SetBounds(offset, location_y, zoom_width, location_height);
+    offset -= GetItemPadding();
+  }
+
   if (chrome_to_mobile_view_ && chrome_to_mobile_view_->visible()) {
     int icon_width = chrome_to_mobile_view_->GetPreferredSize().width();
     offset -= icon_width;
     chrome_to_mobile_view_->SetBounds(offset, location_y,
                                       icon_width, location_height);
     offset -= GetItemPadding();
   }
 
   for (PageActionViews::const_iterator i(page_action_views_.begin());
        i != page_action_views_.end(); ++i) {
@@ skipping 684 matching lines @@
   return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() &&
       !suggested_text_view_->text().empty();
 }
 
 #if !defined(USE_AURA)
 OmniboxViewWin* LocationBarView::GetOmniboxViewWin() {
   return static_cast<OmniboxViewWin*>(location_entry_.get());
 }
 #endif
 #endif