chrome/browser/themes/theme_service_mac.mm - Issue 13497002: Crop images from custom themes before storing them into the theme pack

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/themes/theme_service_mac.mm

Issue 13497002: Crop images from custom themes before storing them into the theme pack (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 7 years, 8 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/themes/theme_service_mac.mm

diff --git a/chrome/browser/themes/theme_service_mac.mm b/chrome/browser/themes/theme_service_mac.mm

index abb441bbea9f68c7c281b8ad7dc370c2669fce85..146558e87214d8646ab5843a003622b96107ade4 100644

--- a/chrome/browser/themes/theme_service_mac.mm

+++ b/chrome/browser/themes/theme_service_mac.mm

@@ -52,9 +52,9 @@ NSImage* ThemeService::GetNSImageNamed(int id, bool allow_default) const {

// - To get the generated tinted images.

NSImage* nsimage = nil;

if (theme_pack_.get()) {

- const gfx::Image* image = theme_pack_->GetImageNamed(id);

- if (image)

- nsimage = image->ToNSImage();

+ gfx::Image image = theme_pack_->GetImageNamed(id);

+ if (!image.IsEmpty())

+ nsimage = image.ToNSImage();

}

// If the theme didn't override this image then load it from the resource

« no previous file with comments | « chrome/browser/themes/theme_service.cc ('k') | chrome/browser/ui/libgtk2ui/gtk2_ui.h » ('j') | no next file with comments »