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

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

Issue 541103002: Introduce ChromeZoomLevelPref, make zoom level prefs independent of profile prefs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase to fix scoped_refptr conversion. Created 6 years, 3 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
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 1005 matching lines...) Expand 10 before | Expand all | Expand 10 after
1016 1016
1017 // Boolean that is true if we should unconditionally block third-party cookies, 1017 // Boolean that is true if we should unconditionally block third-party cookies,
1018 // regardless of other content settings. 1018 // regardless of other content settings.
1019 const char kBlockThirdPartyCookies[] = "profile.block_third_party_cookies"; 1019 const char kBlockThirdPartyCookies[] = "profile.block_third_party_cookies";
1020 1020
1021 // Boolean that is true when all locally stored site data (e.g. cookies, local 1021 // Boolean that is true when all locally stored site data (e.g. cookies, local
1022 // storage, etc..) should be deleted on exit. 1022 // storage, etc..) should be deleted on exit.
1023 const char kClearSiteDataOnExit[] = "profile.clear_site_data_on_exit"; 1023 const char kClearSiteDataOnExit[] = "profile.clear_site_data_on_exit";
1024 1024
1025 // Double that indicates the default zoom level. 1025 // Double that indicates the default zoom level.
1026 const char kDefaultZoomLevel[] = "profile.default_zoom_level"; 1026 const char kDefaultZoomLevel[] = "partition.default_zoom_level";
1027 // TODO(wjmaclean): Remove this.
1028 const char kProfileDefaultZoomLevel[] = "profile.default_zoom_level";
1027 1029
1028 // Dictionary that maps hostnames to zoom levels. Hosts not in this pref will 1030 // Dictionary that maps hostnames to zoom levels. Hosts not in this pref will
1029 // be displayed at the default zoom level. 1031 // be displayed at the default zoom level.
1030 const char kPerHostZoomLevels[] = "profile.per_host_zoom_levels"; 1032 const char kPerHostZoomLevels[] = "partition.per_host_zoom_levels";
1033 // TODO(wjmaclean): Remove this.
1034 const char kProfilePerHostZoomLevels[] = "profile.per_host_zoom_levels";
1031 1035
1032 // A dictionary that tracks the default data model to use for each section of 1036 // A dictionary that tracks the default data model to use for each section of
1033 // the dialog. 1037 // the dialog.
1034 const char kAutofillDialogAutofillDefault[] = "autofill.data_model_default"; 1038 const char kAutofillDialogAutofillDefault[] = "autofill.data_model_default";
1035 1039
1036 // Whether a user opted out of making purchases with Google Wallet; changed via 1040 // Whether a user opted out of making purchases with Google Wallet; changed via
1037 // the autofill dialog's account chooser and set explicitly on dialog submission 1041 // the autofill dialog's account chooser and set explicitly on dialog submission
1038 // (but not cancel). If this isn't set, the dialog assumes it's the first run. 1042 // (but not cancel). If this isn't set, the dialog assumes it's the first run.
1039 const char kAutofillDialogPayWithoutWallet[] = "autofill.pay_without_wallet"; 1043 const char kAutofillDialogPayWithoutWallet[] = "autofill.pay_without_wallet";
1040 1044
(...skipping 1277 matching lines...) Expand 10 before | Expand all | Expand 10 after
2318 const char kPartnerBookmarkMappings[] = "partnerbookmarks.mappings"; 2322 const char kPartnerBookmarkMappings[] = "partnerbookmarks.mappings";
2319 #endif 2323 #endif
2320 2324
2321 // Whether DNS Quick Check is disabled in proxy resolution. 2325 // Whether DNS Quick Check is disabled in proxy resolution.
2322 const char kQuickCheckEnabled[] = "proxy.quick_check_enabled"; 2326 const char kQuickCheckEnabled[] = "proxy.quick_check_enabled";
2323 2327
2324 // Whether Guest Mode is enabled within the browser. 2328 // Whether Guest Mode is enabled within the browser.
2325 const char kBrowserGuestModeEnabled[] = "profile.browser_guest_enabled"; 2329 const char kBrowserGuestModeEnabled[] = "profile.browser_guest_enabled";
2326 2330
2327 } // namespace prefs 2331 } // namespace prefs
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698