diff options
| author | mrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-14 01:42:57 +0000 |
|---|---|---|
| committer | mrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-14 01:42:57 +0000 |
| commit | ead4814b8980d1499c8013753d9900560a69e56d (patch) | |
| tree | b18cb0a23ea98242224e1ea981c994a71e90334f /chrome/browser/themes | |
| parent | aa4b29564773da61eed883c4aafa2ba7fa1c3437 (diff) | |
| download | chromium_src-ead4814b8980d1499c8013753d9900560a69e56d.zip chromium_src-ead4814b8980d1499c8013753d9900560a69e56d.tar.gz chromium_src-ead4814b8980d1499c8013753d9900560a69e56d.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/themes')
| -rw-r--r-- | chrome/browser/themes/theme_service.cc | 6 |
1 files changed, 0 insertions, 6 deletions
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) { |