chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc - Issue 1243513002: linux_aura: Call MapThemeImage for resources missing in native theme

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/frame/browser_desktop_window_tree_host_x11.cc

Issue 1243513002: linux_aura: Call MapThemeImage for resources missing in native theme (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 5 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/frame/browser_desktop_window_tree_host_x11.cc

diff --git a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc

index f45959e13995e26a97f649a0adc2fc604f0346fb..3a82a73130db904610b5960ff75b1e18069dd215 100644

--- a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc

+++ b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc

@@ -28,7 +28,7 @@ class DesktopThemeProvider : public ui::ThemeProvider {

return delegate_->UsingSystemTheme();

}

gfx::ImageSkia* GetImageSkiaNamed(int id) const override {

- if (delegate_->UsingSystemTheme())

+ if (delegate_->UsingSystemTheme() && delegate_->HasCustomImage(id))

return delegate_->GetImageSkiaNamed(id);

return delegate_->GetImageSkiaNamed(

« no previous file with comments | « AUTHORS ('k') | no next file » | no next file with comments »