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

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

Issue 23922007: Merge the LinuxUI interface from its own .so into libviews.so. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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_factory.cc
diff --git a/chrome/browser/themes/theme_service_factory.cc b/chrome/browser/themes/theme_service_factory.cc
index 92fe85cdd03146c9da63d1c0e66d54c213a424fe..e91a16064acde52503e2a0231852d9ca948adeea 100644
--- a/chrome/browser/themes/theme_service_factory.cc
+++ b/chrome/browser/themes/theme_service_factory.cc
@@ -20,7 +20,7 @@
#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
#include "chrome/browser/themes/theme_service_aurax11.h"
-#include "ui/linux_ui/linux_ui.h"
+#include "ui/views/linux_ui/linux_ui.h"
#endif
// static
@@ -74,7 +74,7 @@ void ThemeServiceFactory::RegisterProfilePrefs(
#if defined(TOOLKIT_GTK)
default_uses_system_theme = GtkThemeService::DefaultUsesSystemTheme();
#elif defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
- const ui::LinuxUI* linux_ui = ui::LinuxUI::instance();
+ const views::LinuxUI* linux_ui = views::LinuxUI::instance();
if (linux_ui)
default_uses_system_theme = linux_ui->GetDefaultUsesSystemTheme();
#endif
« no previous file with comments | « chrome/browser/themes/theme_service_aurax11.cc ('k') | chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698