| 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 1b63bccd6a92c17224007dfcc7bc46904b36157e..50b432c71b4ca9ab35e14eacd7ff6d7e6904825b 100644
|
| --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
|
| +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
|
| @@ -242,13 +242,8 @@ class BookmarkButtonBase : public views::LabelButton {
|
| }
|
|
|
| SkColor GetInkDropBaseColor() const override {
|
| - // TODO(bruthig): Inject the color instead of assuming a ThemeProvider is
|
| - // always available. Fall back on LabelButton::GetInkDropBaseColor() so as
|
| - // to avoid difficult to track down crashes.
|
| - return GetThemeProvider()
|
| - ? GetThemeProvider()->GetColor(
|
| - ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON)
|
| - : views::LabelButton::GetInkDropBaseColor();
|
| + return GetThemeProvider()->GetColor(
|
| + ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON);
|
| }
|
|
|
| private:
|
| @@ -345,10 +340,8 @@ class BookmarkMenuButtonBase : public views::MenuButton {
|
| }
|
|
|
| SkColor GetInkDropBaseColor() const override {
|
| - return GetThemeProvider()
|
| - ? GetThemeProvider()->GetColor(
|
| - ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON)
|
| - : views::LabelButton::GetInkDropBaseColor();
|
| + return GetThemeProvider()->GetColor(
|
| + ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON);
|
| }
|
|
|
| private:
|
|
|