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

Unified Diff: chrome/browser/ui/views/toolbar/toolbar_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 (reverted a bad change) 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
Index: chrome/browser/ui/views/toolbar/toolbar_view.cc
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc
index d1624fcd5b4158d8c7e07c5873429a433d16dd82..b99bdec8b5f375638cce08f5661f87d7e43b8f0f 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -309,21 +309,22 @@ bool ToolbarView::IsAppMenuFocused() {
return app_menu_button_->HasFocus();
}
-views::View* ToolbarView::GetBookmarkBubbleAnchor() {
- views::View* star_view = location_bar()->star_view();
+views::WidgetObserverView* ToolbarView::GetBookmarkBubbleAnchor() {
+ views::WidgetObserverView* star_view = location_bar()->star_view();
return (star_view && star_view->visible()) ? star_view : app_menu_button_;
}
-views::View* ToolbarView::GetSaveCreditCardBubbleAnchor() {
- views::View* save_credit_card_icon_view =
+views::WidgetObserverView* ToolbarView::GetSaveCreditCardBubbleAnchor() {
+ views::WidgetObserverView* save_credit_card_icon_view =
location_bar()->save_credit_card_icon_view();
return (save_credit_card_icon_view && save_credit_card_icon_view->visible())
? save_credit_card_icon_view
: app_menu_button_;
}
-views::View* ToolbarView::GetTranslateBubbleAnchor() {
- views::View* translate_icon_view = location_bar()->translate_icon_view();
+views::WidgetObserverView* ToolbarView::GetTranslateBubbleAnchor() {
+ views::WidgetObserverView* translate_icon_view =
+ location_bar()->translate_icon_view();
return (translate_icon_view && translate_icon_view->visible())
? translate_icon_view
: app_menu_button_;

Powered by Google App Engine
This is Rietveld 408576698