Convert location bar bubble delegates to bubble dialog delegates

chrome/browser/ui/views/location_bar/bubble_icon_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/location_bar/bubble_icon_view.h"
 
 #include "chrome/browser/command_updater.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/events/event.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/animation/button_ink_drop_delegate.h"
 #include "ui/views/animation/ink_drop_hover.h"
-#include "ui/views/bubble/bubble_delegate.h"
+#include "ui/views/bubble/bubble_dialog_delegate.h"
 
 BubbleIconView::BubbleIconView(CommandUpdater* command_updater, int command_id)
     : image_(new views::ImageView()),
       command_updater_(command_updater),
       command_id_(command_id),
       active_(false),
       suppress_mouse_released_action_(false),
       ink_drop_delegate_(new views::ButtonInkDropDelegate(this, this)) {
   AddChildView(image_);
   image_->set_interactive(false);
   image_->EnableCanvasFlippingForRTLUI(true);
   image_->SetAccessibilityFocusable(true);
 }
 
 BubbleIconView::~BubbleIconView() {
 }
 
 bool BubbleIconView::IsBubbleShowing() const {
   // If the bubble is being destroyed, it's considered showing though it may be
   // already invisible currently.
-  return GetBubble() != NULL;
+  return !!GetBubble();

[sky, 2016/03/09 16:18:38]

IMO != nullptr is way more readable. Since you don't need to change this, and
there is no style for this, leave it as it was (changing to nullptr if you
want).

[Evan Stade, 2016/03/09 22:37:50]

OK

 }
 
 void BubbleIconView::SetImage(const gfx::ImageSkia* image_skia) {
   image_->SetImage(image_skia);
 }
 
 const gfx::ImageSkia& BubbleIconView::GetImage() const {
   return image_->GetImage();
 }
 
@@ skipping 117 matching lines @@
 
 gfx::VectorIconId BubbleIconView::GetVectorIcon() const {
   return gfx::VectorIconId::VECTOR_ICON_NONE;
 }
 
 bool BubbleIconView::SetRasterIcon() {
   return false;
 }
 
 void BubbleIconView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
-  views::BubbleDelegateView* bubble = GetBubble();
+  views::BubbleDialogDelegateView* bubble = GetBubble();
   if (bubble)
     bubble->OnAnchorBoundsChanged();
 }
 
 void BubbleIconView::UpdateIcon() {
   if (SetRasterIcon())
     return;
 
   const int icon_size =
       ui::MaterialDesignController::IsModeMaterial() ? 16 : 18;
   const ui::NativeTheme* theme = GetNativeTheme();
   SkColor icon_color =
       active_
           ? theme->GetSystemColor(ui::NativeTheme::kColorId_CallToActionColor)
           : GetInkDropBaseColor();
   image_->SetImage(
       gfx::CreateVectorIcon(GetVectorIcon(), icon_size, icon_color));
 }
 
 void BubbleIconView::SetActiveInternal(bool active) {
   if (active_ == active)
     return;
   active_ = active;
   UpdateIcon();
 }