diff options
| author | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-16 05:56:49 +0000 |
|---|---|---|
| committer | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-16 05:56:49 +0000 |
| commit | 7b497d034487829e1945907f14c67d07c7ea2c4b (patch) | |
| tree | 28f20a65805fa44e473d75c17e2ff560f3ab98a0 /ui/base | |
| parent | 1abeec3e1397dfec35921f8d851029abd26a9133 (diff) | |
| download | chromium_src-7b497d034487829e1945907f14c67d07c7ea2c4b.zip chromium_src-7b497d034487829e1945907f14c67d07c7ea2c4b.tar.gz chromium_src-7b497d034487829e1945907f14c67d07c7ea2c4b.tar.bz2 | |
MacViews: Remove "redundant" #ifdef guards in ui/base/theme_provider* files
Some `#if mac && !views` guards have been here for over a year (since
r202283). Mac implies !views so they're currently redundant. But of
course MacViews actually needs this code.
BUG=390755
Review URL: https://codereview.chromium.org/391053002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283369 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base')
| -rw-r--r-- | ui/base/default_theme_provider.h | 2 | ||||
| -rw-r--r-- | ui/base/default_theme_provider_mac.mm | 2 | ||||
| -rw-r--r-- | ui/base/theme_provider.h | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/ui/base/default_theme_provider.h b/ui/base/default_theme_provider.h index e2589c7..8bf2a01 100644 --- a/ui/base/default_theme_provider.h +++ b/ui/base/default_theme_provider.h @@ -34,7 +34,7 @@ class UI_BASE_EXPORT DefaultThemeProvider : public ThemeProvider { int id, ui::ScaleFactor scale_factor) const OVERRIDE; -#if defined(OS_MACOSX) && !defined(TOOLKIT_VIEWS) +#if defined(OS_MACOSX) virtual NSImage* GetNSImageNamed(int id) const OVERRIDE; virtual NSColor* GetNSImageColorNamed(int id) const OVERRIDE; virtual NSColor* GetNSColor(int id) const OVERRIDE; diff --git a/ui/base/default_theme_provider_mac.mm b/ui/base/default_theme_provider_mac.mm index cc33728..6d5e684 100644 --- a/ui/base/default_theme_provider_mac.mm +++ b/ui/base/default_theme_provider_mac.mm @@ -10,7 +10,6 @@ namespace ui { -#if !defined(TOOLKIT_VIEWS) NSImage* DefaultThemeProvider::GetNSImageNamed(int id) const { return ResourceBundle::GetSharedInstance(). GetNativeImageNamed(id).ToNSImage(); @@ -32,6 +31,5 @@ NSColor* DefaultThemeProvider::GetNSColorTint(int id) const { NSGradient* DefaultThemeProvider::GetNSGradient(int id) const { return nil; } -#endif } // namespace ui diff --git a/ui/base/theme_provider.h b/ui/base/theme_provider.h index defdf14..eeab83d 100644 --- a/ui/base/theme_provider.h +++ b/ui/base/theme_provider.h @@ -77,7 +77,7 @@ class UI_BASE_EXPORT ThemeProvider { int id, ui::ScaleFactor scale_factor) const = 0; -#if defined(OS_MACOSX) && !defined(TOOLKIT_VIEWS) +#if defined(OS_MACOSX) // Gets the NSImage with the specified |id|. virtual NSImage* GetNSImageNamed(int id) const = 0; |