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

Unified 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 side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/default_theme_provider.cc
diff --git a/ui/base/default_theme_provider.cc b/ui/base/default_theme_provider.cc
index 4107f104bc10077f661703d23cc09e3a14d0f259..d8e1c6d5853a67d0c9ce0d37df96767bbd1335be 100644
--- a/ui/base/default_theme_provider.cc
+++ b/ui/base/default_theme_provider.cc
@@ -7,10 +7,6 @@
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/image/image_skia.h"
-#if defined(OS_WIN) && !defined(USE_AURA)
-#include "ui/base/win/shell.h"
-#endif
-
namespace ui {
DefaultThemeProvider::DefaultThemeProvider() {}
@@ -35,11 +31,7 @@ int DefaultThemeProvider::GetDisplayProperty(int id) const {
}
bool DefaultThemeProvider::ShouldUseNativeFrame() const {
-#if defined(OS_WIN) && !defined(USE_AURA)
- return ui::win::IsAeroGlassEnabled();
-#else
return false;
-#endif
}
bool DefaultThemeProvider::HasCustomImage(int id) const {
@@ -52,10 +44,4 @@ base::RefCountedMemory* DefaultThemeProvider::GetRawData(
return NULL;
}
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(TOOLKIT_VIEWS) && !defined(OS_ANDROID)
-GdkPixbuf* DefaultThemeProvider::GetRTLEnabledPixbufNamed(int id) const {
- return NULL;
-}
-#endif
-
} // namespace ui
« 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