Notify ThemeService via callback when supervised user is ready.

chrome/browser/themes/theme_service.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/themes/theme_service.h"
 
 #include "base/bind.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/prefs/pref_service.h"
 #include "base/sequenced_task_runner.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
-#include "chrome/browser/managed_mode/managed_user_theme.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/browser_theme_pack.h"
 #include "chrome/browser/themes/custom_theme_supplier.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/themes/theme_syncable_service.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia.h"
 
+#if defined(ENABLE_MANAGED_USERS)
+#include "chrome/browser/managed_mode/managed_user_service.h"
+#include "chrome/browser/managed_mode/managed_user_service_factory.h"
+#include "chrome/browser/managed_mode/managed_user_theme.h"

[Bernhard Bauer, 2013/08/08 15:12:45]

I'm pretty sure this is never built on a platform where ENABLE_MANAGED_USERS is
not defined (as evidenced by the fact that we have an unguarded reference to
ManagedUserTheme below). I don't think #ifdef'ing the includes out here gains us
anything if it's not enforced.

[Adrian Kuegel, 2013/08/08 15:26:35]

Right, I didn't notice that the ManagedUserTheme is not guarded.

+#endif
+
 #if defined(OS_WIN)
 #include "ui/base/win/shell.h"
 #endif
 
 using content::BrowserThread;
 using content::UserMetricsAction;
 using extensions::Extension;
 using ui::ResourceBundle;
 
 typedef ThemeProperties Properties;
@@ skipping 27 matching lines @@
   if (!pack->WriteToDisk(path))
     NOTREACHED() << "Could not write theme pack to disk";
 }
 
 }  // namespace
 
 ThemeService::ThemeService()
     : ready_(false),
       rb_(ResourceBundle::GetSharedInstance()),
       profile_(NULL),
-      number_of_infobars_(0) {
+      number_of_infobars_(0),
+      weak_ptr_factory_(this) {
 }
 
 ThemeService::~ThemeService() {
   FreePlatformCaches();
 }
 
 void ThemeService::Init(Profile* profile) {
   DCHECK(CalledOnValidThread());
   profile_ = profile;
+#if defined(ENABLE_MANAGED_USERS)
+  ManagedUserServiceFactory::GetForProfile(profile)->AddManagedUserInitCallback(
+      base::Bind(&ThemeService::SetManagedUserTheme,
+                 weak_ptr_factory_.GetWeakPtr()));
+#endif
 
   LoadThemePrefs();
 
   if (!ready_) {
     registrar_.Add(this,
                    chrome::NOTIFICATION_EXTENSIONS_READY,
                    content::Source<Profile>(profile_));
   }
 
   theme_syncable_service_.reset(new ThemeSyncableService(profile_, this));
@@ skipping 362 matching lines @@
 void ThemeService::OnInfobarDestroyed() {
   number_of_infobars_--;
 
   if (number_of_infobars_ == 0)
     RemoveUnusedThemes();
 }
 
 ThemeSyncableService* ThemeService::GetThemeSyncableService() const {
   return theme_syncable_service_.get();
 }