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

Unified Diff: chrome/browser/themes/theme_service.cc

Issue 10545037: Aura/GTK integration: Create a small stub library that can talk to GTK. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sky nits Created 8 years, 6 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
Index: chrome/browser/themes/theme_service.cc
diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc
index 2fdcb6a1fc7ecae52e2bd3d0a450641f815ea640..4abf8873575caed0d31aa7fded890973fb3165cc 100644
--- a/chrome/browser/themes/theme_service.cc
+++ b/chrome/browser/themes/theme_service.cc
@@ -30,6 +30,10 @@
#include "ui/views/widget/native_widget_win.h"
#endif
+#if defined(USE_AURA) && !defined(USE_ASH) && defined(OS_LINUX)
+#include "ui/base/linux_ui.h"
+#endif
+
using content::BrowserThread;
using content::UserMetricsAction;
using extensions::Extension;
@@ -241,6 +245,12 @@ const gfx::Image* ThemeService::GetImageNamed(int id) const {
if (theme_pack_.get())
image = theme_pack_->GetImageNamed(id);
+#if defined(USE_AURA) && !defined(USE_ASH) && defined(OS_LINUX)
+ const ui::LinuxUI* linux_ui = ui::LinuxUI::instance();
+ if (!image && linux_ui)
+ image = linux_ui->GetThemeImageNamed(id);
+#endif
+
if (!image)
image = &rb_.GetNativeImageNamed(id);
« no previous file with comments | « no previous file | chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc » ('j') | chrome/browser/ui/libgtk2ui/gtk2_ui.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698