Revert of Updates Zoom bubble layout and adds +/- buttons

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

 // 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.
 
 #import "chrome/browser/ui/cocoa/location_bar/zoom_decoration.h"
 
 #include "base/i18n/number_formatting.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 30 matching lines @@
                                        bool location_bar_is_dark) {
   if (!ShouldShowDecoration()) {
     if (!IsVisible() && !IsBubbleShown())
       return false;
 
     HideUI();
     return true;
   }
 
   BOOL old_visibility = IsVisible();
-  SetVisible(true);
+  SetVisible(ShouldShowDecoration() && !zoom_controller->IsAtDefaultZoom());
 
   base::string16 zoom_percent =
       base::FormatPercent(zoom_controller->GetZoomPercent());
   // There is no icon at the default zoom factor (100%), so don't display a
   // tooltip either.
   NSString* tooltip_string =
       zoom_controller->IsAtDefaultZoom()
           ? @""
           : l10n_util::GetNSStringF(IDS_TOOLTIP_ZOOM, zoom_percent);
 
@@ skipping 58 matching lines @@
 }
 
 void ZoomDecoration::HideUI() {
   CloseBubble();
   SetVisible(false);
 }
 
 void ZoomDecoration::UpdateUI(zoom::ZoomController* zoom_controller,
                               NSString* tooltip_string,
                               bool location_bar_is_dark) {
-  vector_icon_ = zoom_controller->GetZoomRelativeToDefault() ==
-                         zoom::ZoomController::ZOOM_BELOW_DEFAULT_ZOOM
-                     ? &kZoomMinusIcon
-                     : &kZoomPlusIcon;
+  vector_icon_ = nullptr;
+  zoom::ZoomController::RelativeZoom relative_zoom =
+      zoom_controller->GetZoomRelativeToDefault();
+  // There is no icon at the default zoom factor.
+  if (relative_zoom == zoom::ZoomController::ZOOM_BELOW_DEFAULT_ZOOM) {
+    vector_icon_ = &kZoomMinusIcon;
+  } else if (relative_zoom == zoom::ZoomController::ZOOM_ABOVE_DEFAULT_ZOOM) {
+    vector_icon_ = &kZoomPlusIcon;
+  }
 
   SetImage(GetMaterialIcon(location_bar_is_dark));
 
   tooltip_.reset([tooltip_string retain]);
 
   if (ui::MaterialDesignController::IsSecondaryUiMaterial())
     chrome::RefreshZoomBubbleViews();
   else
     [bubble_ onZoomChanged];
 }
@@ skipping 63 matching lines @@
   // closed the decoration can be hidden.
   if (IsAtDefaultZoom() && IsVisible()) {
     SetVisible(false);
     owner_->OnDecorationsChanged();
   }
 }
 
 const gfx::VectorIcon* ZoomDecoration::GetMaterialVectorIcon() const {
   return vector_icon_;
 }