summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhajimehoshi@chromium.org <hajimehoshi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-31 07:56:52 +0000
committerhajimehoshi@chromium.org <hajimehoshi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-31 07:56:52 +0000
commit7acd3dcbb1ebcfa68cf3115ceed5e61f43042013 (patch)
tree5556de9ac034b124831a245c3c47c2b0122e04c8
parent213353e5cb4b2a63733358c40d5e6e672dc08acb (diff)
downloadchromium_src-7acd3dcbb1ebcfa68cf3115ceed5e61f43042013.zip
chromium_src-7acd3dcbb1ebcfa68cf3115ceed5e61f43042013.tar.gz
chromium_src-7acd3dcbb1ebcfa68cf3115ceed5e61f43042013.tar.bz2
Enable syncing kAcceptLanguage on Mac OS X
This preference was not synced because of crbug/44714, but now we can sync it because the language setting exsits on Mac OS X! BUG=244789 Review URL: https://chromiumcodereview.appspot.com/16194004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203365 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc13
-rw-r--r--chrome/browser/ui/prefs/prefs_tab_helper.cc9
2 files changed, 0 insertions, 22 deletions
diff --git a/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
index 2099265..83e6936 100644
--- a/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
@@ -481,28 +481,15 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, kAcceptLanguages) {
AppendStringPref(0, prefs::kAcceptLanguages, ",ar");
AppendStringPref(1, prefs::kAcceptLanguages, ",fr");
ASSERT_TRUE(AwaitQuiescence());
- // kAcceptLanguages is not synced on Mac.
-#if !defined(OS_MACOSX)
ASSERT_TRUE(StringPrefMatches(prefs::kAcceptLanguages));
-#else
- ASSERT_FALSE(StringPrefMatches(prefs::kAcceptLanguages));
-#endif // OS_MACOSX
ChangeStringPref(0, prefs::kAcceptLanguages, "en-US");
ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-#if !defined(OS_MACOSX)
ASSERT_TRUE(StringPrefMatches(prefs::kAcceptLanguages));
-#else
- ASSERT_FALSE(StringPrefMatches(prefs::kAcceptLanguages));
-#endif // OS_MACOSX
ChangeStringPref(0, prefs::kAcceptLanguages, "ar,en-US");
ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-#if !defined(OS_MACOSX)
ASSERT_TRUE(StringPrefMatches(prefs::kAcceptLanguages));
-#else
- ASSERT_FALSE(StringPrefMatches(prefs::kAcceptLanguages));
-#endif // OS_MACOSX
}
// TCM ID - 7590682
diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc
index 3a77806..dd7765b 100644
--- a/chrome/browser/ui/prefs/prefs_tab_helper.cc
+++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc
@@ -557,19 +557,10 @@ void PrefsTabHelper::RegisterUserPrefs(
pref_defaults.force_enable_zoom,
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
#endif
-
-#if !defined(OS_MACOSX)
registry->RegisterLocalizedStringPref(
prefs::kAcceptLanguages,
IDS_ACCEPT_LANGUAGES,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-#else
- // Not used in OSX.
- registry->RegisterLocalizedStringPref(
- prefs::kAcceptLanguages,
- IDS_ACCEPT_LANGUAGES,
- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-#endif
registry->RegisterLocalizedStringPref(
prefs::kDefaultCharset,
IDS_DEFAULT_ENCODING,