Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / themes / theme_service_aurax11.cc

diff --git a/src/chrome/browser/themes/theme_service_aurax11.cc b/src/chrome/browser/themes/theme_service_aurax11.cc
index 7da0336..258053e 100644 (file)
--- a/src/chrome/browser/themes/theme_service_aurax11.cc
+++ b/src/chrome/browser/themes/theme_service_aurax11.cc
@@ -10,13 +10,14 @@
 #include "chrome/browser/themes/custom_theme_supplier.h"
 #include "chrome/common/pref_names.h"
 #include "ui/gfx/image/image.h"
+#include "ui/native_theme/native_theme_aura.h"
 #include "ui/views/linux_ui/linux_ui.h"
 
 namespace {
 
-class NativeThemeX11 : public CustomThemeSupplier {
+class SystemThemeX11 : public CustomThemeSupplier {
  public:
-  explicit NativeThemeX11(PrefService* pref_service);
+  explicit SystemThemeX11(PrefService* pref_service);
 
   // Overridden from CustomThemeSupplier:
   virtual void StartUsingTheme() OVERRIDE;
@@ -26,75 +27,71 @@ class NativeThemeX11 : public CustomThemeSupplier {
   virtual bool HasCustomImage(int id) const OVERRIDE;
 
  private:
-  virtual ~NativeThemeX11();
+  virtual ~SystemThemeX11();
 
   // These pointers are not owned by us.
   views::LinuxUI* const linux_ui_;
   PrefService* const pref_service_;
 
-  DISALLOW_COPY_AND_ASSIGN(NativeThemeX11);
+  DISALLOW_COPY_AND_ASSIGN(SystemThemeX11);
 };
 
-NativeThemeX11::NativeThemeX11(PrefService* pref_service)
+SystemThemeX11::SystemThemeX11(PrefService* pref_service)
     : CustomThemeSupplier(NATIVE_X11),
       linux_ui_(views::LinuxUI::instance()),
       pref_service_(pref_service) {}
 
-void NativeThemeX11::StartUsingTheme() {
+void SystemThemeX11::StartUsingTheme() {
   pref_service_->SetBoolean(prefs::kUsesSystemTheme, true);
+  // Have the former theme notify its observers of change.
+  ui::NativeThemeAura::instance()->NotifyObservers();
 }
 
-void NativeThemeX11::StopUsingTheme() {
+void SystemThemeX11::StopUsingTheme() {
   pref_service_->SetBoolean(prefs::kUsesSystemTheme, false);
+  // Have the former theme notify its observers of change.
+  if (linux_ui_)
+    linux_ui_->GetNativeTheme(NULL)->NotifyObservers();
 }
 
-bool NativeThemeX11::GetColor(int id, SkColor* color) const {
+bool SystemThemeX11::GetColor(int id, SkColor* color) const {
   return linux_ui_ && linux_ui_->GetColor(id, color);
 }
 
-gfx::Image NativeThemeX11::GetImageNamed(int id) {
+gfx::Image SystemThemeX11::GetImageNamed(int id) {
   return linux_ui_ ? linux_ui_->GetThemeImageNamed(id) : gfx::Image();
 }
 
-bool NativeThemeX11::HasCustomImage(int id) const {
+bool SystemThemeX11::HasCustomImage(int id) const {
   return linux_ui_ && linux_ui_->HasCustomImage(id);
 }
 
-NativeThemeX11::~NativeThemeX11() {}
+SystemThemeX11::~SystemThemeX11() {}
 
 }  // namespace
 
-ThemeServiceAuraX11::ThemeServiceAuraX11() {
-  views::LinuxUI* linux_ui = views::LinuxUI::instance();
-  if (linux_ui)
-    linux_ui->AddNativeThemeChangeObserver(this);
-}
+ThemeServiceAuraX11::ThemeServiceAuraX11() {}
 
-ThemeServiceAuraX11::~ThemeServiceAuraX11() {
-  views::LinuxUI* linux_ui = views::LinuxUI::instance();
-  if (linux_ui)
-    linux_ui->RemoveNativeThemeChangeObserver(this);
-}
+ThemeServiceAuraX11::~ThemeServiceAuraX11() {}
 
-bool ThemeServiceAuraX11::ShouldInitWithNativeTheme() const {
+bool ThemeServiceAuraX11::ShouldInitWithSystemTheme() const {
   return profile()->GetPrefs()->GetBoolean(prefs::kUsesSystemTheme);
 }
 
-void ThemeServiceAuraX11::SetNativeTheme() {
-  SetCustomDefaultTheme(new NativeThemeX11(profile()->GetPrefs()));
+void ThemeServiceAuraX11::UseSystemTheme() {
+  SetCustomDefaultTheme(new SystemThemeX11(profile()->GetPrefs()));
+}
+
+bool ThemeServiceAuraX11::IsSystemThemeDistinctFromDefaultTheme() const {
+  return true;
 }
 
 bool ThemeServiceAuraX11::UsingDefaultTheme() const {
-  return ThemeService::UsingDefaultTheme() && !UsingNativeTheme();
+  return ThemeService::UsingDefaultTheme() && !UsingSystemTheme();
 }
 
-bool ThemeServiceAuraX11::UsingNativeTheme() const {
+bool ThemeServiceAuraX11::UsingSystemTheme() const {
   const CustomThemeSupplier* theme_supplier = get_theme_supplier();
   return theme_supplier &&
          theme_supplier->get_theme_type() == CustomThemeSupplier::NATIVE_X11;
 }
-
-void ThemeServiceAuraX11::OnNativeThemeChanged() {
-  if (UsingNativeTheme())
-    NotifyThemeChanged();
-}