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

Unified Diff: chrome/browser/ui/views/translate/translate_bubble_view.cc

Issue 1518543002: Adds MD ink ripple animations to buttons within location bar (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Adds MD ink ripple animations to buttons within location bar (missing member init) Created 4 years, 11 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
« no previous file with comments | « chrome/browser/ui/views/translate/translate_bubble_view.h ('k') | ui/views/controls/image_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/translate/translate_bubble_view.cc
diff --git a/chrome/browser/ui/views/translate/translate_bubble_view.cc b/chrome/browser/ui/views/translate/translate_bubble_view.cc
index a4f83eaf8396f5e4053481ee38e8f44ac050188a..cb07c74157ac36083041341087b83c1126cf7def 100644
--- a/chrome/browser/ui/views/translate/translate_bubble_view.cc
+++ b/chrome/browser/ui/views/translate/translate_bubble_view.cc
@@ -76,7 +76,7 @@ TranslateBubbleView::~TranslateBubbleView() {
}
// static
-void TranslateBubbleView::ShowBubble(
+views::Widget* TranslateBubbleView::ShowBubble(
views::View* anchor_view,
content::WebContents* web_contents,
translate::TranslateStep step,
@@ -88,7 +88,7 @@ void TranslateBubbleView::ShowBubble(
if (translate_bubble_view_->web_contents() == web_contents &&
translate_bubble_view_->model()->GetViewState() ==
TranslateBubbleModel::VIEW_STATE_ADVANCED) {
- return;
+ return nullptr;
}
if (step != translate::TRANSLATE_STEP_TRANSLATE_ERROR) {
TranslateBubbleModel::ViewState state =
@@ -97,11 +97,11 @@ void TranslateBubbleView::ShowBubble(
} else {
translate_bubble_view_->SwitchToErrorView(error_type);
}
- return;
+ return nullptr;
} else {
if (step == translate::TRANSLATE_STEP_AFTER_TRANSLATE &&
reason == AUTOMATIC) {
- return;
+ return nullptr;
}
}
@@ -120,8 +120,9 @@ void TranslateBubbleView::ShowBubble(
new TranslateBubbleModelImpl(step, std::move(ui_delegate)));
TranslateBubbleView* view = new TranslateBubbleView(
anchor_view, std::move(model), error_type, web_contents);
- views::BubbleDelegateView::CreateBubble(view);
+ views::Widget* bubble_widget = views::BubbleDelegateView::CreateBubble(view);
view->ShowForReason(reason);
+ return bubble_widget;
}
// static
« no previous file with comments | « chrome/browser/ui/views/translate/translate_bubble_view.h ('k') | ui/views/controls/image_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698