chrome/browser/ui/views/toolbar/toolbar_action_view.cc - Issue 1805393002: Added MediaRouterUIBrowserTest::toolbar_action_view_ to a Widget.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/toolbar/toolbar_action_view.cc

Issue 1805393002: Added MediaRouterUIBrowserTest::toolbar_action_view_ to a Widget. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Proposed solution. 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

« chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc ('K') | « chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/toolbar/toolbar_action_view.cc

diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_view.cc b/chrome/browser/ui/views/toolbar/toolbar_action_view.cc

index 73f9efba2564c00f13be21f97c8d0083e08aaafd..5b21d747ec9164ecbb9a1ab9235df187530cfef6 100644

--- a/chrome/browser/ui/views/toolbar/toolbar_action_view.cc

+++ b/chrome/browser/ui/views/toolbar/toolbar_action_view.cc

@@ -119,10 +119,10 @@ SkColor ToolbarActionView::GetInkDropBaseColor() const {

ui::NativeTheme::kColorId_HoverMenuItemBackgroundColor);

}

- return GetThemeProvider()

- ? GetThemeProvider()->GetColor(

- ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON)

- : CustomButton::GetInkDropBaseColor();

+ DCHECK(GetThemeProvider());

Evan Stade 2016/03/17 21:41:35 ditto

bruthig 2016/03/18 15:39:22 Removed.

+ return GetThemeProvider()->GetColor(

+ ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON);

}

bool ToolbarActionView::ShouldShowInkDropHover() const {