Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(412)

Side by Side Diff: ui/base/default_theme_provider_mac.mm

Issue 391053002: MacViews: Remove "redundant" #ifdef guards in ui/base/theme_provider* files (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/base/default_theme_provider.h ('k') | ui/base/theme_provider.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/base/default_theme_provider.h" 5 #include "ui/base/default_theme_provider.h"
6 6
7 #import <Cocoa/Cocoa.h> 7 #import <Cocoa/Cocoa.h>
8 8
9 #include "ui/base/resource/resource_bundle.h" 9 #include "ui/base/resource/resource_bundle.h"
10 10
11 namespace ui { 11 namespace ui {
12 12
13 #if !defined(TOOLKIT_VIEWS)
14 NSImage* DefaultThemeProvider::GetNSImageNamed(int id) const { 13 NSImage* DefaultThemeProvider::GetNSImageNamed(int id) const {
15 return ResourceBundle::GetSharedInstance(). 14 return ResourceBundle::GetSharedInstance().
16 GetNativeImageNamed(id).ToNSImage(); 15 GetNativeImageNamed(id).ToNSImage();
17 } 16 }
18 17
19 NSColor* DefaultThemeProvider::GetNSImageColorNamed(int id) const { 18 NSColor* DefaultThemeProvider::GetNSImageColorNamed(int id) const {
20 NSImage* image = GetNSImageNamed(id); 19 NSImage* image = GetNSImageNamed(id);
21 return [NSColor colorWithPatternImage:image]; 20 return [NSColor colorWithPatternImage:image];
22 } 21 }
23 22
24 NSColor* DefaultThemeProvider::GetNSColor(int id) const { 23 NSColor* DefaultThemeProvider::GetNSColor(int id) const {
25 return [NSColor redColor]; 24 return [NSColor redColor];
26 } 25 }
27 26
28 NSColor* DefaultThemeProvider::GetNSColorTint(int id) const { 27 NSColor* DefaultThemeProvider::GetNSColorTint(int id) const {
29 return [NSColor redColor]; 28 return [NSColor redColor];
30 } 29 }
31 30
32 NSGradient* DefaultThemeProvider::GetNSGradient(int id) const { 31 NSGradient* DefaultThemeProvider::GetNSGradient(int id) const {
33 return nil; 32 return nil;
34 } 33 }
35 #endif
36 34
37 } // namespace ui 35 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/default_theme_provider.h ('k') | ui/base/theme_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698