Fix syncing of system theme on Linux

chrome/browser/themes/theme_syncable_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_syncable_service.h"
 
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/common/extensions/manifest_url_handler.h"
 #include "chrome/common/extensions/sync_helper.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/protocol/theme_specifics.pb.h"
 
 using std::string;
 
 namespace {
 
 bool IsTheme(const extensions::Extension* extension) {
   return extension->is_theme();
 }
 
-// TODO(akalin): Remove this.
-bool IsSystemThemeDistinctFromDefaultTheme() {
-#if defined(TOOLKIT_GTK)
-  return true;
-#else
-  return false;
-#endif
-}
-
 }  // namespace
 
 const char ThemeSyncableService::kCurrentThemeClientTag[] = "current_theme";
 const char ThemeSyncableService::kCurrentThemeNodeTitle[] = "Current Theme";
 
 ThemeSyncableService::ThemeSyncableService(Profile* profile,
                                            ThemeService* theme_service)
     : profile_(profile),
       theme_service_(theme_service),
       use_system_theme_by_default_(false) {
@@ skipping 140 matching lines @@
                            "Didn't find valid theme specifics",
                            syncer::THEMES);
 }
 
 void ThemeSyncableService::MaybeSetTheme(
     const sync_pb::ThemeSpecifics& current_specs,
     const syncer::SyncData& sync_data) {
   const sync_pb::ThemeSpecifics& sync_theme = sync_data.GetSpecifics().theme();
   use_system_theme_by_default_ = sync_theme.use_system_theme_by_default();
   DVLOG(1) << "Set current theme from specifics: " << sync_data.ToString();
-  if (!AreThemeSpecificsEqual(current_specs, sync_theme,
-                              IsSystemThemeDistinctFromDefaultTheme())) {
+  if (!AreThemeSpecificsEqual(
+          current_specs,
+          sync_theme,
+          theme_service_->IsSystemThemeDistinctFromDefaultTheme())) {
     SetCurrentThemeFromThemeSpecifics(sync_theme);
   } else {
     DVLOG(1) << "Skip setting theme because specs are equal";
   }
 }
 
 void ThemeSyncableService::SetCurrentThemeFromThemeSpecifics(
     const sync_pb::ThemeSpecifics& theme_specifics) {
   if (theme_specifics.use_custom_theme()) {
     // TODO(akalin): Figure out what to do about third-party themes
@@ skipping 51 matching lines @@
           NULL :
           extensions::ExtensionSystem::Get(profile_)->extension_service()->
               GetExtensionById(theme_service_->GetThemeID(), false);
   if (current_theme && !extensions::sync_helper::IsSyncable(current_theme)) {
     DVLOG(1) << "Ignoring extension from external source: " <<
         current_theme->location();
     return false;
   }
   bool use_custom_theme = (current_theme != NULL);
   theme_specifics->set_use_custom_theme(use_custom_theme);
-  if (IsSystemThemeDistinctFromDefaultTheme()) {
+  if (theme_service_->IsSystemThemeDistinctFromDefaultTheme()) {
     // On platform where system theme is different from default theme, set
     // use_system_theme_by_default to true if system theme is used, false
     // if default system theme is used. Otherwise restore it to value in sync.
     if (theme_service_->UsingSystemTheme()) {
       theme_specifics->set_use_system_theme_by_default(true);
     } else if (theme_service_->UsingDefaultTheme()) {
       theme_specifics->set_use_system_theme_by_default(false);
     } else {
       theme_specifics->set_use_system_theme_by_default(
           use_system_theme_by_default_);
@@ skipping 56 matching lines @@
       syncer::SyncChange(FROM_HERE, change_type,
                          syncer::SyncData::CreateLocalData(
                              kCurrentThemeClientTag, kCurrentThemeNodeTitle,
                              entity_specifics)));
 
   DVLOG(1) << "Update theme specifics from current theme: "
       << changes.back().ToString();
 
   return sync_processor_->ProcessSyncChanges(FROM_HERE, changes);
 }