[Mac] Implement the basic zoom bubble.

chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

 // Copyright 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.
 
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/prefs/pref_service.h"
@@ skipping 85 matching lines @@
       location_icon_decoration_(new LocationIconDecoration(this)),
       search_token_decoration_(new SearchTokenDecoration()),
       selected_keyword_decoration_(
           new SelectedKeywordDecoration(OmniboxViewMac::GetFieldFont())),
       separator_decoration_(new SeparatorDecoration()),
       ev_bubble_decoration_(
           new EVBubbleDecoration(location_icon_decoration_.get(),
                                  OmniboxViewMac::GetFieldFont())),
       plus_decoration_(NULL),
       star_decoration_(new StarDecoration(command_updater)),
-      zoom_decoration_(new ZoomDecoration(toolbar_model)),
+      zoom_decoration_(new ZoomDecoration(this)),
       keyword_hint_decoration_(
           new KeywordHintDecoration(OmniboxViewMac::GetFieldFont())),
       profile_(profile),
       browser_(browser),
       toolbar_model_(toolbar_model),
       transition_(content::PageTransitionFromInt(
           content::PAGE_TRANSITION_TYPED |
           content::PAGE_TRANSITION_FROM_ADDRESS_BAR)),
       weak_ptr_factory_(this) {
   if (extensions::FeatureSwitch::action_box()->IsEnabled()) {
@@ skipping 391 matching lines @@
 
 void LocationBarViewMac::SetActionBoxIcon(int image_id) {
   plus_decoration_->SetTemporaryIcon(image_id);
   OnDecorationsChanged();
 }
 
 void LocationBarViewMac::ZoomChangedForActiveTab(bool can_show_bubble) {
   UpdateZoomDecoration();
   OnDecorationsChanged();
 
-  // TODO(dbeam): show a zoom bubble when |can_show_bubble| is true, the zoom
-  // decoration is showing, and the wrench menu isn't showing.
+  if (can_show_bubble && zoom_decoration_->IsVisible())
+    zoom_decoration_->ShowBubble(YES);
 }
 
 NSPoint LocationBarViewMac::GetActionBoxAnchorPoint() const {
   return plus_decoration_->GetActionBoxAnchorPoint();
 }
 
 NSPoint LocationBarViewMac::GetBookmarkBubblePoint() const {
   AutocompleteTextFieldCell* cell = [field_ cell];
   const NSRect frame = [cell frameForDecoration:star_decoration_.get()
                                         inFrame:[field_ bounds]];
@@ skipping 130 matching lines @@
   // TODO(shess): Shortly, this code will live somewhere else, like in
   // the constructor.  I am still wrestling with how best to deal with
   // right-hand decorations, which are not a static set.
   [cell clearDecorations];
   [cell addLeftDecoration:location_icon_decoration_.get()];
   [cell addLeftDecoration:selected_keyword_decoration_.get()];
   [cell addLeftDecoration:ev_bubble_decoration_.get()];
   if (plus_decoration_.get())
     [cell addRightDecoration:plus_decoration_.get()];
   [cell addRightDecoration:star_decoration_.get()];
-  // TODO(dbeam): uncomment when zoom bubble exists.
-  // [cell addRightDecoration:zoom_decoration_.get()];
+  [cell addRightDecoration:zoom_decoration_.get()];
 
   // Note that display order is right to left.
   for (size_t i = 0; i < page_action_decorations_.size(); ++i) {
     [cell addRightDecoration:page_action_decorations_[i]];
   }
   for (size_t i = 0; i < content_setting_decorations_.size(); ++i) {
     [cell addRightDecoration:content_setting_decorations_[i]];
   }
 
   [cell addRightDecoration:keyword_hint_decoration_.get()];
@@ skipping 101 matching lines @@
   if (!toolbar_model_->GetInputInProgress() &&
       toolbar_model_->WouldReplaceSearchURLWithSearchTerms()) {
     const TemplateURL* template_url =
         TemplateURLServiceFactory::GetForProfile(profile_)->
             GetDefaultSearchProvider();
     if (template_url)
       return template_url->short_name();
   }
   return string16();
 }