chrome/browser/themes/theme_service.h - Issue 7850026: Aura under Linux

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.h

Issue 7850026: Aura under Linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: White spaces Created 9 years, 3 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:

Index: chrome/browser/themes/theme_service.h

diff --git a/chrome/browser/themes/theme_service.h b/chrome/browser/themes/theme_service.h

index 4b8a3ca4edf4fc67ff6d0b6b132342e9e60b7eef..861164ce2ba1c8ae080c7987a421f1106f153faf 100644

--- a/chrome/browser/themes/theme_service.h

+++ b/chrome/browser/themes/theme_service.h

@@ -147,7 +147,7 @@ class ThemeService : public base::NonThreadSafe,

virtual bool ShouldUseNativeFrame() const;

virtual bool HasCustomImage(int id) const;

virtual RefCountedMemory* GetRawData(int id) const;

-#if defined(TOOLKIT_USES_GTK)

+#if defined(TOOLKIT_USES_GTK) && !defined(USE_AURA)

// GdkPixbufs returned by GetPixbufNamed and GetRTLEnabledPixbufNamed are

// shared instances owned by the theme provider and should not be freed.

virtual GdkPixbuf* GetPixbufNamed(int id) const;