Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7701)

Unified Diff: chrome/browser/ui/views/location_bar/bubble_icon_view.cc

Issue 1759453002: Convert location bar bubble delegates to bubble dialog delegates (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix ImmersiveFullscreenController Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/location_bar/bubble_icon_view.cc
diff --git a/chrome/browser/ui/views/location_bar/bubble_icon_view.cc b/chrome/browser/ui/views/location_bar/bubble_icon_view.cc
index 3c66ce46c307d090fd084cfc77c2d5f4624c2ebf..24939d18485929dabe4b733f9556a0f65296b502 100644
--- a/chrome/browser/ui/views/location_bar/bubble_icon_view.cc
+++ b/chrome/browser/ui/views/location_bar/bubble_icon_view.cc
@@ -14,7 +14,7 @@
#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()),
@@ -35,7 +35,7 @@ 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() != nullptr;
}
void BubbleIconView::SetImage(const gfx::ImageSkia* image_skia) {
@@ -173,7 +173,7 @@ bool BubbleIconView::SetRasterIcon() {
}
void BubbleIconView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
- views::BubbleDelegateView* bubble = GetBubble();
+ views::BubbleDialogDelegateView* bubble = GetBubble();
if (bubble)
bubble->OnAnchorBoundsChanged();
}

Powered by Google App Engine
This is Rietveld 408576698