Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(759)

Side by Side Diff: chrome/common/pref_names.cc

Issue 6248017: Do not use local override for language settings: always sync. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/common/pref_names.h" 5 #include "chrome/common/pref_names.h"
6 6
7 namespace prefs { 7 namespace prefs {
8 8
9 // *************** PROFILE PREFS *************** 9 // *************** PROFILE PREFS ***************
10 // These are attached to the user profile 10 // These are attached to the user profile
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 // The application locale. 43 // The application locale.
44 // For OS_CHROMEOS we maintain kApplicationLocale property in both local state 44 // For OS_CHROMEOS we maintain kApplicationLocale property in both local state
45 // and user's profile. Global property determines locale of login screen, 45 // and user's profile. Global property determines locale of login screen,
46 // while user's profile determines his personal locale preference. 46 // while user's profile determines his personal locale preference.
47 const char kApplicationLocale[] = "intl.app_locale"; 47 const char kApplicationLocale[] = "intl.app_locale";
48 #if defined(OS_CHROMEOS) 48 #if defined(OS_CHROMEOS)
49 // Non-syncable item. Used to detect locale change. 49 // Non-syncable item. Used to detect locale change.
50 // Used for two-step initialization of locale in ChromeOS 50 // Used for two-step initialization of locale in ChromeOS
51 // because synchronization of kApplicationLocale is not instant. 51 // because synchronization of kApplicationLocale is not instant.
52 const char kApplicationLocaleBackup[] = "intl.app_locale_backup"; 52 const char kApplicationLocaleBackup[] = "intl.app_locale_backup";
53 // Non-syncable item.
54 // Used to locally override synchronized kApplicationLocale preference.
55 const char kApplicationLocaleOverride[] = "intl.app_locale_override";
56 // Locale accepted by user. Non-syncable. 53 // Locale accepted by user. Non-syncable.
57 // Used to determine whether we need to show Locale Change notification. 54 // Used to determine whether we need to show Locale Change notification.
58 const char kApplicationLocaleAccepted[] = "intl.app_locale_accepted"; 55 const char kApplicationLocaleAccepted[] = "intl.app_locale_accepted";
59 #endif 56 #endif
60 57
61 // The default character encoding to assume for a web page in the 58 // The default character encoding to assume for a web page in the
62 // absence of MIME charset specification 59 // absence of MIME charset specification
63 const char kDefaultCharset[] = "intl.charset_default"; 60 const char kDefaultCharset[] = "intl.charset_default";
64 61
65 // The value to use for Accept-Languages HTTP header when making an HTTP 62 // The value to use for Accept-Languages HTTP header when making an HTTP
(...skipping 1134 matching lines...) Expand 10 before | Expand all | Expand 10 after
1200 const char kManagedDefaultPluginsSetting[] = 1197 const char kManagedDefaultPluginsSetting[] =
1201 "profile.managed_default_content_settings.plugins"; 1198 "profile.managed_default_content_settings.plugins";
1202 const char kManagedDefaultPopupsSetting[] = 1199 const char kManagedDefaultPopupsSetting[] =
1203 "profile.managed_default_content_settings.popups"; 1200 "profile.managed_default_content_settings.popups";
1204 1201
1205 // Dictionary for storing the set of known background pages (keys are extension 1202 // Dictionary for storing the set of known background pages (keys are extension
1206 // IDs of background page owners, value is a boolean that is true if the user 1203 // IDs of background page owners, value is a boolean that is true if the user
1207 // needs to acknowledge this page. 1204 // needs to acknowledge this page.
1208 const char kKnownBackgroundPages[] = "background_pages.known"; 1205 const char kKnownBackgroundPages[] = "background_pages.known";
1209 } // namespace prefs 1206 } // namespace prefs
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698