chrome/browser/themes/theme_service.h - Issue 23614007: Use the normal Google logo for managed users for --enable-instant-extended-api

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 23614007: Use the normal Google logo for managed users for --enable-instant-extended-api (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed mac compile failure Created 7 years, 4 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.h

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

index 22abfdea308b3a0c7cc62d722f1a9a538619b754..73db1d49dc7875398bb6285911f0f19a45905d9c 100644

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

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

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

// Overridden from ui::ThemeProvider:

virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const OVERRIDE;

virtual SkColor GetColor(int id) const OVERRIDE;

- virtual bool GetDisplayProperty(int id, int* result) const OVERRIDE;

+ virtual int GetDisplayProperty(int id) const OVERRIDE;

virtual bool ShouldUseNativeFrame() const OVERRIDE;

virtual bool HasCustomImage(int id) const OVERRIDE;

virtual base::RefCountedMemory* GetRawData(

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