Convert location bar bubble delegates to bubble dialog delegates

chrome/browser/ui/views/location_bar/zoom_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/zoom_view.h"
 
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/toolbar/toolbar_model.h"
@@ skipping 11 matching lines @@
   Update(NULL);
 }
 
 ZoomView::~ZoomView() {
 }
 
 void ZoomView::Update(ui_zoom::ZoomController* zoom_controller) {
   if (!zoom_controller || zoom_controller->IsAtDefaultZoom() ||
       location_bar_delegate_->GetToolbarModel()->input_in_progress()) {
     SetVisible(false);
-    ZoomBubbleView::CloseBubble();
+    ZoomBubbleView::CloseCurrentBubble();
     return;
   }
 
   SetTooltipText(l10n_util::GetStringFUTF16Int(
       IDS_TOOLTIP_ZOOM, zoom_controller->GetZoomPercent()));
 
   // The icon is hidden when the zoom level is default.
   image_id_ = zoom_controller->GetZoomRelativeToDefault() ==
                       ui_zoom::ZoomController::ZOOM_BELOW_DEFAULT_ZOOM
                   ? gfx::VectorIconId::ZOOM_MINUS
                   : gfx::VectorIconId::ZOOM_PLUS;
   if (GetNativeTheme())
     UpdateIcon();
 
   SetVisible(true);
 }
 
 void ZoomView::OnExecuting(BubbleIconView::ExecuteSource source) {
   ZoomBubbleView::ShowBubble(location_bar_delegate_->GetWebContents(),
                              ZoomBubbleView::USER_GESTURE);
 }
 
 void ZoomView::GetAccessibleState(ui::AXViewState* state) {
   BubbleIconView::GetAccessibleState(state);
   state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_ZOOM);
 }
 
-views::BubbleDelegateView* ZoomView::GetBubble() const {
+views::BubbleDialogDelegateView* ZoomView::GetBubble() const {
   return ZoomBubbleView::GetZoomBubble();
 }
 
 gfx::VectorIconId ZoomView::GetVectorIcon() const {
   return image_id_;
 }