diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-17 22:15:13 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-17 22:15:13 +0000 |
commit | a3d3a7cf3b81cc8d00490bb7bfd92b57f0146d9c (patch) | |
tree | 7ae34f2b5e389e3d90bb54a94e04690ca0af416e /app/theme_provider.h | |
parent | d32185d54315610c0f3afc5e57edd9c7b7663a95 (diff) | |
download | chromium_src-a3d3a7cf3b81cc8d00490bb7bfd92b57f0146d9c.zip chromium_src-a3d3a7cf3b81cc8d00490bb7bfd92b57f0146d9c.tar.gz chromium_src-a3d3a7cf3b81cc8d00490bb7bfd92b57f0146d9c.tar.bz2 |
Allow the Mac theme provider to give default colors/tints if requested. Switch the download shelf's "open downloads" link to directly use the theme provider.
BUG=http://crbug.com/35554
TEST=no visible change in normal mode; incognito mode still being worked on
Review URL: http://codereview.chromium.org/630002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39279 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/theme_provider.h')
-rw-r--r-- | app/theme_provider.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/app/theme_provider.h b/app/theme_provider.h index cd97fa8..1db73e1 100644 --- a/app/theme_provider.h +++ b/app/theme_provider.h @@ -71,20 +71,23 @@ class ThemeProvider { // Gets the NSImage with the specified |id|. // // The bitmap is not assumed to exist. If a theme does not provide an image, + // if |allow_default| is true, then the default image will be returned, else // this function will return nil. - virtual NSImage* GetNSImageNamed(int id) const = 0; + virtual NSImage* GetNSImageNamed(int id, bool allow_default) const = 0; // Gets the NSColor with the specified |id|. // - // The color is not assumed to exist. If a theme does not provide an color, - // this function will return nil. - virtual NSColor* GetNSColor(int id) const = 0; + // The color is not assumed to exist. If a theme does not provide an color, if + // |allow_default| is true, then the default color will be returned, else this + // function will return nil. + virtual NSColor* GetNSColor(int id, bool allow_default) const = 0; // Gets the NSColor for tinting with the specified |id|. // // The tint is not assumed to exist. If a theme does not provide a tint with - // that id, this function will return nil. - virtual NSColor* GetNSColorTint(int id) const = 0; + // that id, if |allow_default| is true, then the default tint will be + // returned, else this function will return nil. + virtual NSColor* GetNSColorTint(int id, bool allow_default) const = 0; #elif defined(OS_POSIX) && !defined(TOOLKIT_VIEWS) // Gets the GdkPixbuf with the specified |id|. Returns a pointer to a shared // instance of the GdkPixbuf. This shared GdkPixbuf is owned by the theme |