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

Side by Side Diff: ui/views/widget/default_theme_provider.cc

Issue 10388064: Add GetImageSkiaNamed to resource_bundle and theme_provider (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed nits Created 8 years, 7 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/views/widget/default_theme_provider.h ('k') | no next file » | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/views/widget/default_theme_provider.h" 5 #include "ui/views/widget/default_theme_provider.h"
6 6
7 #include "ui/base/resource/resource_bundle.h" 7 #include "ui/base/resource/resource_bundle.h"
8 #include "ui/gfx/image/image_skia.h"
8 9
9 #if defined(OS_WIN) && !defined(USE_AURA) 10 #if defined(OS_WIN) && !defined(USE_AURA)
10 #include "ui/views/widget/native_widget_win.h" 11 #include "ui/views/widget/native_widget_win.h"
11 #endif 12 #endif
12 13
13 namespace views { 14 namespace views {
14 15
15 DefaultThemeProvider::DefaultThemeProvider() {} 16 DefaultThemeProvider::DefaultThemeProvider() {}
16 17
17 DefaultThemeProvider::~DefaultThemeProvider() {} 18 DefaultThemeProvider::~DefaultThemeProvider() {}
18 19
19 SkBitmap* DefaultThemeProvider::GetBitmapNamed(int id) const { 20 SkBitmap* DefaultThemeProvider::GetBitmapNamed(int id) const {
20 return ResourceBundle::GetSharedInstance().GetBitmapNamed(id); 21 return ResourceBundle::GetSharedInstance().GetBitmapNamed(id);
21 } 22 }
22 23
24 gfx::ImageSkia* DefaultThemeProvider::GetImageSkiaNamed(int id) const {
25 return ResourceBundle::GetSharedInstance().GetImageSkiaNamed(id);
26 }
27
23 SkColor DefaultThemeProvider::GetColor(int id) const { 28 SkColor DefaultThemeProvider::GetColor(int id) const {
24 // Return debugging-blue. 29 // Return debugging-blue.
25 return 0xff0000ff; 30 return 0xff0000ff;
26 } 31 }
27 32
28 bool DefaultThemeProvider::GetDisplayProperty(int id, int* result) const { 33 bool DefaultThemeProvider::GetDisplayProperty(int id, int* result) const {
29 return false; 34 return false;
30 } 35 }
31 36
32 bool DefaultThemeProvider::ShouldUseNativeFrame() const { 37 bool DefaultThemeProvider::ShouldUseNativeFrame() const {
33 #if defined(OS_WIN) && !defined(USE_AURA) 38 #if defined(OS_WIN) && !defined(USE_AURA)
34 return NativeWidgetWin::IsAeroGlassEnabled(); 39 return NativeWidgetWin::IsAeroGlassEnabled();
35 #else 40 #else
36 return false; 41 return false;
37 #endif 42 #endif
38 } 43 }
39 44
40 bool DefaultThemeProvider::HasCustomImage(int id) const { 45 bool DefaultThemeProvider::HasCustomImage(int id) const {
41 return false; 46 return false;
42 } 47 }
43 48
44 base::RefCountedMemory* DefaultThemeProvider::GetRawData(int id) const { 49 base::RefCountedMemory* DefaultThemeProvider::GetRawData(int id) const {
45 return NULL; 50 return NULL;
46 } 51 }
47 52
48 } // namespace views 53 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/widget/default_theme_provider.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698