[Mac] Hide Zoom Decoration for Default Zoom

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"
 #import "chrome/browser/ui/cocoa/l10n_util.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/zoom/zoom_controller.h"
 #include "ui/base/cocoa/cocoa_base_utils.h"
 #include "ui/base/l10n/l10n_util_mac.h"
-#include "ui/base/material_design/material_design_controller.h"
 
 ZoomDecoration::ZoomDecoration(LocationBarViewMac* owner)
     : owner_(owner),
       bubble_(nil),
       vector_icon_id_(gfx::VectorIconId::VECTOR_ICON_NONE) {}
 
 ZoomDecoration::~ZoomDecoration() {
   [bubble_ closeWithoutAnimation];
   bubble_.delegate = nil;
 }
 
 bool ZoomDecoration::UpdateIfNecessary(zoom::ZoomController* zoom_controller,
                                        bool default_zoom_changed,
                                        bool location_bar_is_dark) {
   if (!ShouldShowDecoration()) {
     if (!IsVisible() && !bubble_)
       return false;
 
     HideUI();
     return true;
   }
 
+  SetVisible(ShouldShowDecoration() && !zoom_controller->IsAtDefaultZoom());
+
   base::string16 zoom_percent =
       base::FormatPercent(zoom_controller->GetZoomPercent());
-  // In Material Design there is no icon at the default zoom factor (100%), so
-  // don't display a tooltip either.
+  // 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);
 
-  if (IsVisible() && [tooltip_ isEqualToString:tooltip_string] &&
-      !default_zoom_changed) {
+  if ([tooltip_ isEqualToString:tooltip_string] && !default_zoom_changed)
     return false;
-  }
 
-  ShowAndUpdateUI(zoom_controller, tooltip_string, location_bar_is_dark);
+  UpdateUI(zoom_controller, tooltip_string, location_bar_is_dark);
   return true;
 }
 
 void ZoomDecoration::ShowBubble(BOOL auto_close) {
   if (bubble_) {
     bubble_.delegate = nil;
     [[bubble_.window parentWindow] removeChildWindow:bubble_.window];
     [bubble_.window orderOut:nil];
     [bubble_ closeWithoutAnimation];
   }
@@ skipping 19 matching lines @@
 
 void ZoomDecoration::CloseBubble() {
   [bubble_ close];
 }
 
 void ZoomDecoration::HideUI() {
   [bubble_ close];
   SetVisible(false);
 }
 
-void ZoomDecoration::ShowAndUpdateUI(zoom::ZoomController* zoom_controller,
-                                     NSString* tooltip_string,
-                                     bool location_bar_is_dark) {
+void ZoomDecoration::UpdateUI(zoom::ZoomController* zoom_controller,
+                              NSString* tooltip_string,
+                              bool location_bar_is_dark) {
   vector_icon_id_ = gfx::VectorIconId::VECTOR_ICON_NONE;
   zoom::ZoomController::RelativeZoom relative_zoom =
       zoom_controller->GetZoomRelativeToDefault();
-  // In Material Design there is no icon at the default zoom factor.
+  // There is no icon at the default zoom factor.
   if (relative_zoom == zoom::ZoomController::ZOOM_BELOW_DEFAULT_ZOOM) {
     vector_icon_id_ = gfx::VectorIconId::ZOOM_MINUS;
   } else if (relative_zoom == zoom::ZoomController::ZOOM_ABOVE_DEFAULT_ZOOM) {
     vector_icon_id_ = gfx::VectorIconId::ZOOM_PLUS;
   }
 
   SetImage(GetMaterialIcon(location_bar_is_dark));
 
   tooltip_.reset([tooltip_string retain]);
 
-  SetVisible(true);
   [bubble_ onZoomChanged];
 }
 
 NSPoint ZoomDecoration::GetBubblePointInFrame(NSRect frame) {
   return NSMakePoint(cocoa_l10n_util::ShouldDoExperimentalRTLLayout()
                          ? NSMinX(frame)
                          : NSMaxX(frame),
                      NSMaxY(frame));
 }
 
@@ skipping 42 matching lines @@
   // closed the decoration can be hidden.
   if (IsAtDefaultZoom() && IsVisible()) {
     SetVisible(false);
     owner_->OnDecorationsChanged();
   }
 }
 
 gfx::VectorIconId ZoomDecoration::GetMaterialVectorIconId() const {
   return vector_icon_id_;
 }