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

chrome/browser/themes/theme_service_aurax11.cc

 // Copyright 2013 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_aurax11.h"
 
 #include "base/bind.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/themes/custom_theme_supplier.h"
 #include "chrome/common/pref_names.h"
 #include "ui/gfx/image/image.h"
 #include "ui/linux_ui/linux_ui.h"
 
-ThemeServiceAuraX11::ThemeServiceAuraX11()
-    : use_system_theme_(false) {
+namespace {
+
+class NativeThemeX11 : public CustomThemeSupplier {
+ public:
+  explicit NativeThemeX11(PrefService* pref_service);
+
+  // Overridden from CustomThemeSupplier:
+  virtual void StartUsingTheme() OVERRIDE;
+  virtual void StopUsingTheme() OVERRIDE;
+  virtual gfx::Image GetImageNamed(int id) OVERRIDE;

[pkotwicz, 2013/07/19 18:33:20]

GetImageNamed() should be below GetColor() to match order in
custom_theme_supplier.h

[Adrian Kuegel, 2013/07/22 12:58:08]

Done.

+  virtual bool GetColor(int id, SkColor* color) const OVERRIDE;
+  virtual bool HasCustomImage(int id) const OVERRIDE;
+
+ private:
+  virtual ~NativeThemeX11();
+
+  // These pointers are not owned by us.
+  const ui::LinuxUI* const linux_ui_;
+  PrefService* const pref_service_;
+
+  DISALLOW_COPY_AND_ASSIGN(NativeThemeX11);
+};
+
+NativeThemeX11::NativeThemeX11(PrefService* pref_service)
+    : CustomThemeSupplier(NATIVE_X11),
+      linux_ui_(ui::LinuxUI::instance()),
+      pref_service_(pref_service) {}
+
+NativeThemeX11::~NativeThemeX11() {}

[pkotwicz, 2013/07/19 18:33:20]

Nit: Put the destructor last to match order defined above.

[Adrian Kuegel, 2013/07/22 12:58:08]

Done.

+
+void NativeThemeX11::StartUsingTheme() {
+  pref_service_->SetBoolean(prefs::kUsesSystemTheme, true);
 }
 
+void NativeThemeX11::StopUsingTheme() {
+  pref_service_->SetBoolean(prefs::kUsesSystemTheme, false);
+}
+
+gfx::Image NativeThemeX11::GetImageNamed(int id) {
+  return linux_ui_ ? linux_ui_->GetThemeImageNamed(id) : gfx::Image();
+}
+
+bool NativeThemeX11::GetColor(int id, SkColor* color) const {
+  return linux_ui_ && linux_ui_->GetColor(id, color);
+}
+
+bool NativeThemeX11::HasCustomImage(int id) const {
+  return linux_ui_ && linux_ui_->HasCustomImage(id);
+}
+
+}  // namespace
+
+ThemeServiceAuraX11::ThemeServiceAuraX11() {}
+
 ThemeServiceAuraX11::~ThemeServiceAuraX11() {}
 
-void ThemeServiceAuraX11::Init(Profile* profile) {
-  registrar_.Init(profile->GetPrefs());
-  registrar_.Add(prefs::kUsesSystemTheme,
-                 base::Bind(&ThemeServiceAuraX11::OnUsesSystemThemeChanged,
-                            base::Unretained(this)));
-  use_system_theme_ = profile->GetPrefs()->GetBoolean(prefs::kUsesSystemTheme);
-
-  ThemeService::Init(profile);
-}
-
-gfx::Image ThemeServiceAuraX11::GetImageNamed(int id) const {
-  const ui::LinuxUI* linux_ui = ui::LinuxUI::instance();
-  if (use_system_theme_ && linux_ui) {
-    gfx::Image image = linux_ui->GetThemeImageNamed(id);
-    if (!image.IsEmpty())
-      return image;
-  }
-
-  return ThemeService::GetImageNamed(id);
-}
-
-SkColor ThemeServiceAuraX11::GetColor(int id) const {
-  const ui::LinuxUI* linux_ui = ui::LinuxUI::instance();
-  SkColor color;
-  if (use_system_theme_ && linux_ui && linux_ui->GetColor(id, &color))
-    return color;
-
-  return ThemeService::GetColor(id);
-}
-
-bool ThemeServiceAuraX11::HasCustomImage(int id) const {
-  const ui::LinuxUI* linux_ui = ui::LinuxUI::instance();
-  if (use_system_theme_ && linux_ui)
-    return linux_ui->HasCustomImage(id);
-
-  return ThemeService::HasCustomImage(id);
-}
-
-void ThemeServiceAuraX11::SetTheme(const extensions::Extension* extension) {
-  profile()->GetPrefs()->SetBoolean(prefs::kUsesSystemTheme, false);
-  ThemeService::SetTheme(extension);
-}
-
-void ThemeServiceAuraX11::UseDefaultTheme() {
-  profile()->GetPrefs()->SetBoolean(prefs::kUsesSystemTheme, false);
-  ThemeService::UseDefaultTheme();
+bool ThemeServiceAuraX11::ShouldInitWithNativeTheme() {
+  return profile()->GetPrefs()->GetBoolean(prefs::kUsesSystemTheme);
 }
 
 void ThemeServiceAuraX11::SetNativeTheme() {
-  profile()->GetPrefs()->SetBoolean(prefs::kUsesSystemTheme, true);
-  ClearAllThemeData();
-  NotifyThemeChanged();
+  ThemeService::SetCustomDefaultTheme(

[pkotwicz, 2013/07/19 18:33:20]

Nit: You do not need to prepend SetCustomDefaultTheme() with ThemeService.

[Adrian Kuegel, 2013/07/22 12:58:08]

Right. Done.

+      new NativeThemeX11(profile()->GetPrefs()));
 }
 
 bool ThemeServiceAuraX11::UsingDefaultTheme() const {
-  return !use_system_theme_ && ThemeService::UsingDefaultTheme();
+  return ThemeService::UsingDefaultTheme() && !UsingNativeTheme();
 }
 
 bool ThemeServiceAuraX11::UsingNativeTheme() const {
-  return use_system_theme_;
+  return GetThemeSupplier() &&
+         GetThemeSupplier()->GetThemeType() == CustomThemeSupplier::NATIVE_X11;
 }
-
-void ThemeServiceAuraX11::OnUsesSystemThemeChanged() {
-  use_system_theme_ =
-      profile()->GetPrefs()->GetBoolean(prefs::kUsesSystemTheme);
-}