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

Unified Diff: chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

Issue 2067013002: Removed InkDropFactory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed views:: -> ui:: compile error. Created 4 years, 6 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/bookmarks/bookmark_bar_view.cc
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
index 57f2168c0db379b1bd1928321a53a75300a51dfb..f008bffab4a1e6d59bcc72da6e75e9b45ea47752 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -205,7 +205,7 @@ class BookmarkButtonBase : public views::LabelButton {
const base::string16& title)
: LabelButton(listener, title) {
SetElideBehavior(kElideBehavior);
- SetHasInkDrop(true);
+ SetHasInkDrop(ui::MaterialDesignController::IsModeMaterial());
set_has_ink_drop_action_on_click(true);
show_animation_.reset(new gfx::SlideAnimation(this));
if (!animations_enabled) {
@@ -331,7 +331,7 @@ class BookmarkMenuButtonBase : public views::MenuButton {
views::MenuButtonListener* menu_button_listener,
bool show_menu_marker)
: MenuButton(title, menu_button_listener, show_menu_marker) {
- SetHasInkDrop(true);
+ SetHasInkDrop(ui::MaterialDesignController::IsModeMaterial());
}
std::unique_ptr<views::InkDropRipple> CreateInkDropRipple() const override {
« no previous file with comments | « chrome/browser/ui/views/bar_control_button.cc ('k') | chrome/browser/ui/views/download/download_item_view_md.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698