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

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

Issue 1744483002: Monitor the system native frame color on Win 10. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review comments Created 4 years, 10 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
« no previous file with comments | « chrome/browser/themes/theme_service.cc ('k') | chrome/browser/themes/theme_service_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 9f7ebbd67b0edb3020444a845588359fcf68e7a2..3e72af0e2ad096ec6f5a1ae7d6dc3028e5b1d4af 100644
--- a/chrome/browser/themes/theme_service_factory.cc
+++ b/chrome/browser/themes/theme_service_factory.cc
@@ -16,7 +16,9 @@
#include "extensions/browser/extension_registry.h"
#include "extensions/browser/extension_registry_factory.h"
-#if defined(USE_AURA) && defined(USE_X11) && !defined(OS_CHROMEOS)
+#if defined(OS_WIN)
+#include "chrome/browser/themes/theme_service_win.h"
+#elif 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"
#endif
@@ -55,7 +57,9 @@ ThemeServiceFactory::~ThemeServiceFactory() {}
KeyedService* ThemeServiceFactory::BuildServiceInstanceFor(
content::BrowserContext* profile) const {
ThemeService* provider = NULL;
-#if defined(USE_AURA) && defined(USE_X11) && !defined(OS_CHROMEOS)
+#if defined(OS_WIN)
+ provider = new ThemeServiceWin;
+#elif defined(USE_AURA) && defined(USE_X11) && !defined(OS_CHROMEOS)
provider = new ThemeServiceAuraX11;
#else
provider = new ThemeService;
« no previous file with comments | « chrome/browser/themes/theme_service.cc ('k') | chrome/browser/themes/theme_service_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698