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

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

Issue 1083683003: Speculative revert by sheriff (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed an unrelated commit that had accidentally slipped in. Created 5 years, 8 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
« no previous file with comments | « chrome/common/pref_names.h ('k') | chrome/interactive_ui_tests.isolate » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "chrome/common/pref_font_webkit_names.h" 8 #include "chrome/common/pref_font_webkit_names.h"
9 9
10 namespace prefs { 10 namespace prefs {
(...skipping 1901 matching lines...) Expand 10 before | Expand all | Expand 10 after
1912 1912
1913 // An integer pref of the current consumer management stage. The meaning of the 1913 // An integer pref of the current consumer management stage. The meaning of the
1914 // value is defined in: 1914 // value is defined in:
1915 // chrome/browser/chromeos/policy/consumer_management_stage.h 1915 // chrome/browser/chromeos/policy/consumer_management_stage.h
1916 const char kConsumerManagementStage[] = "consumer_management.stage"; 1916 const char kConsumerManagementStage[] = "consumer_management.stage";
1917 1917
1918 // A boolean pref. If set to true, new experimental OOBE UI is displayed. 1918 // A boolean pref. If set to true, new experimental OOBE UI is displayed.
1919 const char kNewOobe[] = "NewOobe"; 1919 const char kNewOobe[] = "NewOobe";
1920 1920
1921 // A boolean pref. If set to true, experimental webview based signin flow 1921 // A boolean pref. If set to true, experimental webview based signin flow
1922 // is deactivated. 1922 // activated.
1923 const char kWebviewSigninDisabled[] = "webview_signin_disabled"; 1923 const char kWebviewSigninEnabled[] =
1924 "webview_signin_enabled";
1924 #endif // defined(OS_CHROMEOS) 1925 #endif // defined(OS_CHROMEOS)
1925 1926
1926 // Whether there is a Flash version installed that supports clearing LSO data. 1927 // Whether there is a Flash version installed that supports clearing LSO data.
1927 const char kClearPluginLSODataEnabled[] = "browser.clear_lso_data_enabled"; 1928 const char kClearPluginLSODataEnabled[] = "browser.clear_lso_data_enabled";
1928 1929
1929 // Whether we should show Pepper Flash-specific settings. 1930 // Whether we should show Pepper Flash-specific settings.
1930 const char kPepperFlashSettingsEnabled[] = 1931 const char kPepperFlashSettingsEnabled[] =
1931 "browser.pepper_flash_settings_enabled"; 1932 "browser.pepper_flash_settings_enabled";
1932 1933
1933 // String which specifies where to store the disk cache. 1934 // String which specifies where to store the disk cache.
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
2294 // (name and a list of clients that registered the whitelist). 2295 // (name and a list of clients that registered the whitelist).
2295 const char kRegisteredSupervisedUserWhitelists[] = 2296 const char kRegisteredSupervisedUserWhitelists[] =
2296 "supervised_users.whitelists"; 2297 "supervised_users.whitelists";
2297 2298
2298 #if defined(ENABLE_EXTENSIONS) 2299 #if defined(ENABLE_EXTENSIONS)
2299 // Policy that indicates how to handle animated images. 2300 // Policy that indicates how to handle animated images.
2300 const char kAnimationPolicy[] = "settings.a11y.animation_policy"; 2301 const char kAnimationPolicy[] = "settings.a11y.animation_policy";
2301 #endif 2302 #endif
2302 2303
2303 } // namespace prefs 2304 } // namespace prefs
OLDNEW
« no previous file with comments | « chrome/common/pref_names.h ('k') | chrome/interactive_ui_tests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698