| Index: chrome/browser/themes/theme_service_factory.cc
|
| diff --git a/chrome/browser/themes/theme_service_factory.cc b/chrome/browser/themes/theme_service_factory.cc
|
| index 4bfe354eb91a1b435e351c1c7ac77a4efca72a7b..396d32ab9d261ac9a476fdeb1d2f4ba633c9fd5b 100644
|
| --- a/chrome/browser/themes/theme_service_factory.cc
|
| +++ b/chrome/browser/themes/theme_service_factory.cc
|
| @@ -14,10 +14,6 @@
|
| #include "components/keyed_service/content/browser_context_dependency_manager.h"
|
| #include "components/user_prefs/pref_registry_syncable.h"
|
|
|
| -#if defined(TOOLKIT_GTK)
|
| -#include "chrome/browser/ui/gtk/gtk_theme_service.h"
|
| -#endif
|
| -
|
| #if defined(USE_AURA) && defined(USE_X11) && !defined(OS_CHROMEOS)
|
| #include "chrome/browser/themes/theme_service_aurax11.h"
|
| #include "ui/views/linux_ui/linux_ui.h"
|
| @@ -54,9 +50,7 @@ ThemeServiceFactory::~ThemeServiceFactory() {}
|
| KeyedService* ThemeServiceFactory::BuildServiceInstanceFor(
|
| content::BrowserContext* profile) const {
|
| ThemeService* provider = NULL;
|
| -#if defined(TOOLKIT_GTK)
|
| - provider = new GtkThemeService;
|
| -#elif defined(USE_AURA) && defined(USE_X11) && !defined(OS_CHROMEOS)
|
| +#if defined(USE_AURA) && defined(USE_X11) && !defined(OS_CHROMEOS)
|
| provider = new ThemeServiceAuraX11;
|
| #else
|
| provider = new ThemeService;
|
| @@ -71,9 +65,7 @@ void ThemeServiceFactory::RegisterProfilePrefs(
|
| #if defined(USE_X11) && !defined(OS_CHROMEOS)
|
| bool default_uses_system_theme = false;
|
|
|
| -#if defined(TOOLKIT_GTK)
|
| - default_uses_system_theme = GtkThemeService::DefaultUsesSystemTheme();
|
| -#elif defined(USE_AURA) && defined(USE_X11) && !defined(OS_CHROMEOS)
|
| +#if defined(USE_AURA) && defined(USE_X11) && !defined(OS_CHROMEOS)
|
| const views::LinuxUI* linux_ui = views::LinuxUI::instance();
|
| if (linux_ui)
|
| default_uses_system_theme = linux_ui->GetDefaultUsesSystemTheme();
|
|
|