From ead4814b8980d1499c8013753d9900560a69e56d Mon Sep 17 00:00:00 2001 From: "mrossetti@chromium.org" Date: Thu, 14 Jun 2012 01:42:57 +0000 Subject: Revert 142036 - Aura GTK theme: Use gtk icons and borders for back/forward/home. The color stuff is copied from the gtk_theme_service.cc, but the GtkButton and GtkIcon rendering code is all new. TODO: How am I going to convert the background for the omnibox? BUG=130810 TEST=none Review URL: https://chromiumcodereview.appspot.com/10540147 TBR=erg@chromium.org Review URL: https://chromiumcodereview.appspot.com/10533141 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142063 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/themes/theme_service.cc | 6 ------ 1 file changed, 6 deletions(-) (limited to 'chrome/browser/themes') diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc index def55f8..4abf887 100644 --- a/chrome/browser/themes/theme_service.cc +++ b/chrome/browser/themes/theme_service.cc @@ -281,12 +281,6 @@ SkColor ThemeService::GetColor(int id) const { if (theme_pack_.get() && theme_pack_->GetColor(id, &color)) return color; -#if defined(USE_AURA) && !defined(USE_ASH) && defined(OS_LINUX) - const ui::LinuxUI* linux_ui = ui::LinuxUI::instance(); - if (linux_ui && linux_ui->GetColor(id, &color)) - return color; -#endif - // For backward compat with older themes, some newer colors are generated from // older ones if they are missing. switch (id) { -- cgit v1.1