Convert location bar bubble delegates to bubble dialog delegates

chrome/browser/ui/views/translate/translate_bubble_view.cc

 // Copyright 2013 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/translate/translate_bubble_view.h"
 
 #include <stddef.h>
 #include <algorithm>
 #include <string>
 #include <utility>
@@ skipping 102 matching lines @@
   scoped_ptr<translate::TranslateUIDelegate> ui_delegate(
       new translate::TranslateUIDelegate(
           ChromeTranslateClient::GetManagerFromWebContents(web_contents)
               ->GetWeakPtr(),
           source_language,
           target_language));
   scoped_ptr<TranslateBubbleModel> model(
       new TranslateBubbleModelImpl(step, std::move(ui_delegate)));
   TranslateBubbleView* view = new TranslateBubbleView(
       anchor_view, std::move(model), error_type, web_contents);
-  views::Widget* bubble_widget = views::BubbleDelegateView::CreateBubble(view);
+  views::Widget* bubble_widget =
+      views::BubbleDialogDelegateView::CreateBubble(view);
   view->ShowForReason(reason);
   return bubble_widget;
 }
 
 // static
-void TranslateBubbleView::CloseBubble() {
+void TranslateBubbleView::CloseCurrentBubble() {
   if (!translate_bubble_view_)
     return;
 
-  translate_bubble_view_->GetWidget()->Close();
+  translate_bubble_view_->CloseBubble();

[msw, 2016/03/03 23:01:40]

optional nit: invert conditional and nest, like other impls.

[Evan Stade, 2016/03/07 18:36:38]

Done.

 }
 
 // static
 TranslateBubbleView* TranslateBubbleView::GetCurrentBubble() {
   return translate_bubble_view_;
 }
 
 void TranslateBubbleView::Init() {
   SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical,
                                         0, 0, 0));
@@ skipping 62 matching lines @@
     case TranslateBubbleModel::VIEW_STATE_ERROR:
       break;
     case TranslateBubbleModel::VIEW_STATE_ADVANCED: {
       if (accelerator.key_code() == ui::VKEY_RETURN) {
         HandleButtonPressed(BUTTON_ID_DONE);
         return true;
       }
       break;
     }
   }
-  return BubbleDelegateView::AcceleratorPressed(accelerator);
+  return BubbleDialogDelegateView::AcceleratorPressed(accelerator);
 }
 
 gfx::Size TranslateBubbleView::GetPreferredSize() const {
   int width = 0;
   for (int i = 0; i < child_count(); i++) {
     const views::View* child = child_at(i);
     width = std::max(width, child->GetPreferredSize().width());
   }
   int height = GetCurrentView()->GetPreferredSize().height();
   return gfx::Size(width, height);
@@ skipping 526 matching lines @@
   base::string16 label;
   if (model_->IsPageTranslatedInCurrentLanguages())
     label = l10n_util::GetStringUTF16(IDS_DONE);
   else
     label = l10n_util::GetStringUTF16(IDS_TRANSLATE_BUBBLE_ACCEPT);
   advanced_done_button_->SetText(label);
   advanced_done_button_->SizeToPreferredSize();
   if (advanced_view_)
     advanced_view_->Layout();
 }