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

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

Index: chrome/browser/ui/views/location_bar/location_bar_view.cc
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index 1ec72cd57f7eb623ccd1bd088489bb2b42a1fdeb..284f8672adcee772b35cd6d0e4879e2190544d6c 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -320,10 +320,9 @@
   }
 
   WebContents* web_contents = GetWebContents();
-  if (can_show_bubble && web_contents) {
+  if (can_show_bubble && zoom_view_->visible() && web_contents)
     ZoomBubbleView::ShowBubble(web_contents, gfx::Point(),
                                ZoomBubbleView::AUTOMATIC);
-  }
 }
 
 void LocationBarView::SetStarToggled(bool on) {
@@ -702,6 +701,8 @@
     return false;
   const bool was_visible = zoom_view_->visible();
   zoom_view_->Update(zoom::ZoomController::FromWebContents(web_contents));
+  if (!zoom_view_->visible())
+    ZoomBubbleView::CloseCurrentBubble();
   return was_visible != zoom_view_->visible();
 }
 
@@ -882,11 +883,6 @@
   }
 }
 
-void LocationBarView::UpdateZoomViewVisibility() {
-  RefreshZoomView();
-  OnChanged();
-}
-
 void LocationBarView::UpdateLocationBarVisibility(bool visible, bool animate) {
   if (!animate) {
     size_animation_.Reset(visible ? 1 : 0);