Add custom default theme support and create a managed user default theme.

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/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(OS_WIN)
 #include "ui/base/win/shell.h"
 #endif
 
 #if defined(ENABLE_MANAGED_USERS)
 #include "chrome/browser/managed_mode/managed_user_service.h"
+#include "chrome/browser/managed_mode/managed_user_theme.h"
 #endif
 
 using content::BrowserThread;
 using content::UserMetricsAction;
 using extensions::Extension;
 using ui::ResourceBundle;
 
 typedef ThemeProperties Properties;
 
 // The default theme if we haven't installed a theme yet or if we've clicked
@@ skipping 50 matching lines @@
                    chrome::NOTIFICATION_EXTENSIONS_READY,
                    content::Source<Profile>(profile_));
   }
 
   theme_syncable_service_.reset(new ThemeSyncableService(profile_, this));
 }
 
 gfx::Image ThemeService::GetImageNamed(int id) const {
   DCHECK(CalledOnValidThread());
 
-  // For a managed user, use the special frame instead of the default one.
-  // TODO(akuegel): Remove this once we have the default managed user theme.
-  if (IsManagedUser()) {
-    if (id == IDR_THEME_FRAME)
-      id = IDR_MANAGED_USER_THEME_FRAME;
-    else if (id == IDR_THEME_FRAME_INACTIVE)
-      id = IDR_MANAGED_USER_THEME_FRAME_INACTIVE;
-    else if (id == IDR_THEME_TAB_BACKGROUND || id == IDR_THEME_TAB_BACKGROUND_V)
-      id = IDR_MANAGED_USER_THEME_TAB_BACKGROUND;
-  }
-
   gfx::Image image;
-  if (theme_pack_.get())
-    image = theme_pack_->GetImageNamed(id);
+  if (theme_supplier_.get())
+    image = theme_supplier_->GetImageNamed(id);
 
   if (image.IsEmpty())
     image = rb_.GetNativeImageNamed(id);
 
   return image;
 }
 
 gfx::ImageSkia* ThemeService::GetImageSkiaNamed(int id) const {
   gfx::Image image = GetImageNamed(id);
   if (image.IsEmpty())
     return NULL;
   // TODO(pkotwicz): Remove this const cast.  The gfx::Image interface returns
   // its images const. GetImageSkiaNamed() also should but has many callsites.
   return const_cast<gfx::ImageSkia*>(image.ToImageSkia());
 }
 
 SkColor ThemeService::GetColor(int id) const {
   DCHECK(CalledOnValidThread());
-
-  // TODO(akuegel): Remove this once we have the default managed user theme.
-  if (IsManagedUser()) {
-    if (id == Properties::COLOR_FRAME)
-      id = Properties::COLOR_FRAME_MANAGED_USER;
-    else if (id == Properties::COLOR_FRAME_INACTIVE)
-      id = Properties::COLOR_FRAME_MANAGED_USER_INACTIVE;
-  }
-
   SkColor color;
-  if (theme_pack_.get() && theme_pack_->GetColor(id, &color))
+  if (theme_supplier_.get() && theme_supplier_->GetColor(id, &color))
     return color;
 
   // For backward compat with older themes, some newer colors are generated from
   // older ones if they are missing.
   switch (id) {
     case Properties::COLOR_NTP_SECTION_HEADER_TEXT:
       return IncreaseLightness(GetColor(Properties::COLOR_NTP_TEXT), 0.30);
     case Properties::COLOR_NTP_SECTION_HEADER_TEXT_HOVER:
       return GetColor(Properties::COLOR_NTP_TEXT);
     case Properties::COLOR_NTP_SECTION_HEADER_RULE:
       return IncreaseLightness(GetColor(Properties::COLOR_NTP_TEXT), 0.70);
     case Properties::COLOR_NTP_SECTION_HEADER_RULE_LIGHT:
       return IncreaseLightness(GetColor(Properties::COLOR_NTP_TEXT), 0.86);
     case Properties::COLOR_NTP_TEXT_LIGHT:
       return IncreaseLightness(GetColor(Properties::COLOR_NTP_TEXT), 0.40);
     case Properties::COLOR_MANAGED_USER_LABEL:
-      // TODO(akuegel): Use GetReadableColor() once we want to support other
-      // themes as well.
-      return SkColorSetRGB(231, 245, 255);
+      return color_utils::GetReadableColor(
+          SK_ColorWHITE,
+          GetColor(Properties::COLOR_MANAGED_USER_LABEL_BACKGROUND));
     case Properties::COLOR_MANAGED_USER_LABEL_BACKGROUND:
-      // TODO(akuegel): Replace this constant by a color calculated from the
-      // frame color once the default managed user theme is finished and we
-      // allow managed users to install other themes.
-      return SkColorSetRGB(108, 167, 210);
+      return color_utils::BlendTowardOppositeLuminance(
+          GetColor(Properties::COLOR_FRAME), 0x80);
   }
 
   return Properties::GetDefaultColor(id);
 }
 
 bool ThemeService::GetDisplayProperty(int id, int* result) const {
-  if (theme_pack_.get())
-    return theme_pack_->GetDisplayProperty(id, result);
+  if (theme_supplier_.get())
+    return theme_supplier_->GetDisplayProperty(id, result);
 
   return Properties::GetDefaultDisplayProperty(id, result);
 }
 
 bool ThemeService::ShouldUseNativeFrame() const {
   if (HasCustomImage(IDR_THEME_FRAME))
     return false;
 #if defined(OS_WIN)
   return ui::win::IsAeroGlassEnabled();
 #else
   return false;
 #endif
 }
 
 bool ThemeService::HasCustomImage(int id) const {
   if (!Properties::IsThemeableImage(id))
     return false;
 
-  if (theme_pack_.get())
-    return theme_pack_->HasCustomImage(id);
-
-  if (IsManagedUser() &&
-      (id == IDR_THEME_FRAME || id == IDR_THEME_FRAME_INACTIVE ||
-       id == IDR_THEME_TAB_BACKGROUND || id == IDR_THEME_TAB_BACKGROUND_V))
-    return true;
+  if (theme_supplier_.get())
+    return theme_supplier_->HasCustomImage(id);
 
   return false;
 }
 
 base::RefCountedMemory* ThemeService::GetRawData(
     int id,
     ui::ScaleFactor scale_factor) const {
   // Check to see whether we should substitute some images.
   int ntp_alternate;
   GetDisplayProperty(Properties::NTP_LOGO_ALTERNATE, &ntp_alternate);
   if (id == IDR_PRODUCT_LOGO && ntp_alternate != 0)
     id = IDR_PRODUCT_LOGO_WHITE;
 
   base::RefCountedMemory* data = NULL;
-  if (theme_pack_.get())
-    data = theme_pack_->GetRawData(id, scale_factor);
+  if (theme_supplier_.get())
+    data = theme_supplier_->GetRawData(id, scale_factor);
   if (!data)
     data = rb_.LoadDataResourceBytesForScale(id, ui::SCALE_FACTOR_100P);
 
   return data;
 }
 
 void ThemeService::Observe(int type,
                            const content::NotificationSource& source,
                            const content::NotificationDetails& details) {
   DCHECK(type == chrome::NOTIFICATION_EXTENSIONS_READY);
@@ skipping 21 matching lines @@
     DCHECK(service->GetExtensionById(extension->id(), false));
   }
 
   BuildFromExtension(extension);
   SaveThemeID(extension->id());
 
   NotifyThemeChanged();
   content::RecordAction(UserMetricsAction("Themes_Installed"));
 }
 
+void ThemeService::SetCustomDefaultTheme(
+    scoped_refptr<CustomThemeSupplier> theme_supplier) {
+  ClearAllThemeData();
+  SwapThemeSupplier(theme_supplier);
+
+  // When loading the theme in LoadThemePrefs(), it is not necessary to call
+  // NotifyThemeChanged().
+  if (ready_)

[pkotwicz, 2013/07/22 20:17:28]

Actually, you can skip checking |ready_| here. And do not need a comment.
No one should be listening for NOTIFICATION_BROWSER_THEME_CHANGED before the
ThemeService object has finished being constructed.

[Adrian Kuegel, 2013/07/23 08:13:29]

Done.

+    NotifyThemeChanged();
+}
+
+bool ThemeService::ShouldInitWithNativeTheme() {
+  return false;
+}
+
 void ThemeService::RemoveUnusedThemes() {
-  if (!profile_)
+  // We do not want to garbage collect themes on startup (|ready_| is false).
+  // Themes will get garbage collected once
+  // ExtensionService::GarbageCollectExtensions() runs

[pkotwicz, 2013/07/22 20:17:28]

Nit '.' at the end of the sentence

[Adrian Kuegel, 2013/07/23 08:13:29]

Done.

+  if (!profile_ || !ready_)
     return;
+
   ExtensionService* service = profile_->GetExtensionService();
   if (!service)
     return;
   std::string current_theme = GetThemeID();
   std::vector<std::string> remove_list;
   const ExtensionSet* extensions = service->extensions();
   for (ExtensionSet::const_iterator it = extensions->begin();
        it != extensions->end(); ++it) {
     if ((*it)->is_theme() && (*it)->id() != current_theme) {
       remove_list.push_back((*it)->id());
     }
   }
   for (size_t i = 0; i < remove_list.size(); ++i)
     service->UninstallExtension(remove_list[i], false, NULL);
 }
 
 void ThemeService::UseDefaultTheme() {
+  content::RecordAction(UserMetricsAction("Themes_Reset"));
+  if (IsManagedUser()) {
+    SetManagedUserTheme();
+    return;
+  }
   ClearAllThemeData();
   NotifyThemeChanged();
-  content::RecordAction(UserMetricsAction("Themes_Reset"));
 }
 
 void ThemeService::SetNativeTheme() {
   UseDefaultTheme();
 }
 
 bool ThemeService::UsingDefaultTheme() const {
   std::string id = GetThemeID();

[pkotwicz, 2013/07/22 20:17:28]

Optional: You may not want to check |kDefaultThemeGalleryID| for managed users.

[Adrian Kuegel, 2013/07/23 08:13:29]

Right, good point. Changed.

   return id == ThemeService::kDefaultThemeID ||
       id == kDefaultThemeGalleryID;
 }
 
 bool ThemeService::UsingNativeTheme() const {
   return UsingDefaultTheme();
 }
 
 std::string ThemeService::GetThemeID() const {
   return profile_->GetPrefs()->GetString(prefs::kCurrentThemeID);
 }
 
 color_utils::HSL ThemeService::GetTint(int id) const {
   DCHECK(CalledOnValidThread());
 
   color_utils::HSL hsl;
-  if (theme_pack_.get() && theme_pack_->GetTint(id, &hsl))
+  if (theme_supplier_.get() && theme_supplier_->GetTint(id, &hsl))
     return hsl;
 
   return ThemeProperties::GetDefaultTint(id);
 }
 
 void ThemeService::ClearAllThemeData() {
+  SwapThemeSupplier(NULL);
+
   // Clear our image cache.
   FreePlatformCaches();
-  theme_pack_ = NULL;
+  theme_supplier_ = NULL;

[pkotwicz, 2013/07/22 20:17:28]

The line above should be done for us by SwapThemeSupplier().

[Adrian Kuegel, 2013/07/23 08:13:29]

Right. I have removed this line now.

 
   profile_->GetPrefs()->ClearPref(prefs::kCurrentThemePackFilename);
   SaveThemeID(kDefaultThemeID);
 
   RemoveUnusedThemes();
 }
 
 void ThemeService::LoadThemePrefs() {
   PrefService* prefs = profile_->GetPrefs();
 
   std::string current_id = GetThemeID();
   if (current_id == kDefaultThemeID) {
+    // Managed users should always have their own default theme.

[pkotwicz, 2013/07/22 20:17:28]

How about: "Managed users have a different default theme".

[Adrian Kuegel, 2013/07/23 08:13:29]

Done.

+    if (IsManagedUser())
+      SetManagedUserTheme();
+    else if (ShouldInitWithNativeTheme())
+      SetNativeTheme();

[pkotwicz, 2013/07/22 20:17:28]

I would rather call UseDefaultTheme() in the else case. And check is_ready()
before recording "Themes_Reset".
This allows you to avoid calling LoadDefaultValues() in
GtkThemeService::LoadThemePrefs().
This will also fix GtkThemeService::UsingNativeTheme() from sometimes returning
true when you are using the managed user theme.

[Adrian Kuegel, 2013/07/23 08:13:29]

Done.

     set_ready();
     return;
   }
 
   bool loaded_pack = false;
 
   // If we don't have a file pack, we're updating from an old version.
   base::FilePath path = prefs->GetFilePath(prefs::kCurrentThemePackFilename);
   if (path != base::FilePath()) {
-    theme_pack_ = BrowserThemePack::BuildFromDataPack(path, current_id);
-    loaded_pack = theme_pack_.get() != NULL;
+    SwapThemeSupplier(BrowserThemePack::BuildFromDataPack(path, current_id));
+    loaded_pack = theme_supplier_.get() != NULL;
   }
 
   if (loaded_pack) {
     content::RecordAction(UserMetricsAction("Themes.Loaded"));
     set_ready();
   } else {
     // TODO(erg): We need to pop up a dialog informing the user that their
     // theme is being migrated.
     ExtensionService* service =
         extensions::ExtensionSystem::Get(profile_)->extension_service();
@@ skipping 21 matching lines @@
     theme_syncable_service_->OnThemeChange();
   }
 }
 
 #if defined(OS_WIN) || defined(USE_AURA)
 void ThemeService::FreePlatformCaches() {
   // Views (Skia) has no platform image cache to clear.
 }
 #endif
 
+void ThemeService::SwapThemeSupplier(
+    scoped_refptr<CustomThemeSupplier> theme_supplier) {
+  if (theme_supplier_.get())
+    theme_supplier_->StopUsingTheme();
+  theme_supplier_ = theme_supplier;
+  if (theme_supplier_.get())
+    theme_supplier_->StartUsingTheme();
+}
+
 void ThemeService::MigrateTheme() {
   ExtensionService* service =
       extensions::ExtensionSystem::Get(profile_)->extension_service();
   const Extension* extension = service ?
       service->GetExtensionById(GetThemeID(), false) : NULL;
   if (extension) {
     DLOG(ERROR) << "Migrating theme";
     BuildFromExtension(extension);
     content::RecordAction(UserMetricsAction("Themes.Migrated"));
   } else {
@@ skipping 28 matching lines @@
     return;
 
   // Write the packed file to disk.
   base::FilePath pack_path =
       extension->path().Append(chrome::kThemePackFilename);
   service->GetFileTaskRunner()->PostTask(
       FROM_HERE,
       base::Bind(&WritePackToDiskCallback, pack, pack_path));
 
   SavePackName(pack_path);
-  theme_pack_ = pack;
+  SwapThemeSupplier(pack);
 }
 
 bool ThemeService::IsManagedUser() const {
 #if defined(ENABLE_MANAGED_USERS)
   return ManagedUserService::ProfileIsManaged(profile_);
 #endif
   return false;
 }
 
+void ThemeService::SetManagedUserTheme() {
+#if defined(ENABLE_MANAGED_USERS)
+  SetCustomDefaultTheme(new ManagedUserTheme);
+#endif
+}
+
 void ThemeService::OnInfobarDisplayed() {
   number_of_infobars_++;
 }
 
 void ThemeService::OnInfobarDestroyed() {
   number_of_infobars_--;
 
   if (number_of_infobars_ == 0)
     RemoveUnusedThemes();
 }
 
 ThemeSyncableService* ThemeService::GetThemeSyncableService() const {
   return theme_syncable_service_.get();
 }