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

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

Issue 355233002: Fix build when ENABLE_MANAGED_USERS is not defined (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 6 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.cc
diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc
index c7650acc314ee96a47ecfa9ddf7f18861f677190..32d469404456e0c72c9d90f912aa512dd906282d 100644
--- a/chrome/browser/themes/theme_service.cc
+++ b/chrome/browser/themes/theme_service.cc
@@ -14,7 +14,6 @@
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/supervised_user/supervised_user_theme.h"
#include "chrome/browser/themes/browser_theme_pack.h"
#include "chrome/browser/themes/custom_theme_supplier.h"
#include "chrome/browser/themes/theme_properties.h"
@@ -34,6 +33,10 @@
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/image/image_skia.h"
+#if defined(ENABLE_MANAGED_USERS)
+#include "chrome/browser/supervised_user/supervised_user_theme.h"
+#endif
+
#if defined(OS_WIN)
#include "ui/base/win/shell.h"
#endif
@@ -586,7 +589,11 @@ bool ThemeService::IsSupervisedUser() const {
}
void ThemeService::SetSupervisedUserTheme() {
Bernhard Bauer 2014/06/30 16:04:18 Could we move the whole method into the #ifdef?
mckev 2014/07/11 18:27:54 Done.
+#if defined(ENABLE_MANAGED_USERS)
SetCustomDefaultTheme(new SupervisedUserTheme);
+#else
+ DCHECK(false) << "Supervised users aren't enabled.";
Bernhard Bauer 2014/06/30 16:04:18 This is more commonly written as NOTREACHED() (see
mckev 2014/07/11 18:27:54 Awesome, thanks for the tip!
+#endif
}
void ThemeService::OnInfobarDisplayed() {

Powered by Google App Engine
This is Rietveld 408576698