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

Side by Side Diff: ui/base/default_theme_provider.cc

Issue 246633004: Remove non USE_AURA code from views files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Just revert changes to ui/app_list/. Created 6 years, 8 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/dragdrop/drag_utils_win.cc » ('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) 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/base/default_theme_provider.h" 5 #include "ui/base/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 #include "ui/gfx/image/image_skia.h"
9 9
10 #if defined(OS_WIN) && !defined(USE_AURA)
11 #include "ui/base/win/shell.h"
12 #endif
13
14 namespace ui { 10 namespace ui {
15 11
16 DefaultThemeProvider::DefaultThemeProvider() {} 12 DefaultThemeProvider::DefaultThemeProvider() {}
17 13
18 DefaultThemeProvider::~DefaultThemeProvider() {} 14 DefaultThemeProvider::~DefaultThemeProvider() {}
19 15
20 bool DefaultThemeProvider::UsingNativeTheme() const { 16 bool DefaultThemeProvider::UsingNativeTheme() const {
21 return true; 17 return true;
22 } 18 }
23 19
24 gfx::ImageSkia* DefaultThemeProvider::GetImageSkiaNamed(int id) const { 20 gfx::ImageSkia* DefaultThemeProvider::GetImageSkiaNamed(int id) const {
25 return ResourceBundle::GetSharedInstance().GetImageSkiaNamed(id); 21 return ResourceBundle::GetSharedInstance().GetImageSkiaNamed(id);
26 } 22 }
27 23
28 SkColor DefaultThemeProvider::GetColor(int id) const { 24 SkColor DefaultThemeProvider::GetColor(int id) const {
29 // Return debugging-blue. 25 // Return debugging-blue.
30 return 0xff0000ff; 26 return 0xff0000ff;
31 } 27 }
32 28
33 int DefaultThemeProvider::GetDisplayProperty(int id) const { 29 int DefaultThemeProvider::GetDisplayProperty(int id) const {
34 return -1; 30 return -1;
35 } 31 }
36 32
37 bool DefaultThemeProvider::ShouldUseNativeFrame() const { 33 bool DefaultThemeProvider::ShouldUseNativeFrame() const {
38 #if defined(OS_WIN) && !defined(USE_AURA)
39 return ui::win::IsAeroGlassEnabled();
40 #else
41 return false; 34 return false;
42 #endif
43 } 35 }
44 36
45 bool DefaultThemeProvider::HasCustomImage(int id) const { 37 bool DefaultThemeProvider::HasCustomImage(int id) const {
46 return false; 38 return false;
47 } 39 }
48 40
49 base::RefCountedMemory* DefaultThemeProvider::GetRawData( 41 base::RefCountedMemory* DefaultThemeProvider::GetRawData(
50 int id, 42 int id,
51 ui::ScaleFactor scale_factor) const { 43 ui::ScaleFactor scale_factor) const {
52 return NULL; 44 return NULL;
53 } 45 }
54 46
55 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(TOOLKIT_VIEWS) && !defi ned(OS_ANDROID)
56 GdkPixbuf* DefaultThemeProvider::GetRTLEnabledPixbufNamed(int id) const {
57 return NULL;
58 }
59 #endif
60
61 } // namespace ui 47 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/default_theme_provider.h ('k') | ui/base/dragdrop/drag_utils_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698