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

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: Fix HostZOomMapBrowserTest. Created 6 years, 2 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 1006 matching lines...) Expand 10 before | Expand all | Expand 10 after
1017 1017
1018 // Boolean that is true if we should unconditionally block third-party cookies, 1018 // Boolean that is true if we should unconditionally block third-party cookies,
1019 // regardless of other content settings. 1019 // regardless of other content settings.
1020 const char kBlockThirdPartyCookies[] = "profile.block_third_party_cookies"; 1020 const char kBlockThirdPartyCookies[] = "profile.block_third_party_cookies";
1021 1021
1022 // Boolean that is true when all locally stored site data (e.g. cookies, local 1022 // Boolean that is true when all locally stored site data (e.g. cookies, local
1023 // storage, etc..) should be deleted on exit. 1023 // storage, etc..) should be deleted on exit.
1024 const char kClearSiteDataOnExit[] = "profile.clear_site_data_on_exit"; 1024 const char kClearSiteDataOnExit[] = "profile.clear_site_data_on_exit";
1025 1025
1026 // Double that indicates the default zoom level. 1026 // Double that indicates the default zoom level.
1027 const char kDefaultZoomLevel[] = "profile.default_zoom_level"; 1027 const char kDefaultZoomLevel[] = "partition.default_zoom_level";
1028 // TODO(wjmaclean): Remove this.
1029 const char kProfileDefaultZoomLevel[] = "profile.default_zoom_level";
gab 2014/10/02 20:58:42 s/kProfileDefaultZoomLevel/kDefaultZoomLevelInProf
wjmaclean 2014/10/03 18:53:22 Done.
1028 1030
1029 // Dictionary that maps hostnames to zoom levels. Hosts not in this pref will 1031 // Dictionary that maps hostnames to zoom levels. Hosts not in this pref will
1030 // be displayed at the default zoom level. 1032 // be displayed at the default zoom level.
1031 const char kPerHostZoomLevels[] = "profile.per_host_zoom_levels"; 1033 const char kPerHostZoomLevels[] = "partition.per_host_zoom_levels";
1034 // TODO(wjmaclean): Remove this.
1035 const char kProfilePerHostZoomLevels[] = "profile.per_host_zoom_levels";
1032 1036
1033 // A dictionary that tracks the default data model to use for each section of 1037 // A dictionary that tracks the default data model to use for each section of
1034 // the dialog. 1038 // the dialog.
1035 const char kAutofillDialogAutofillDefault[] = "autofill.data_model_default"; 1039 const char kAutofillDialogAutofillDefault[] = "autofill.data_model_default";
1036 1040
1037 // Whether a user opted out of making purchases with Google Wallet; changed via 1041 // Whether a user opted out of making purchases with Google Wallet; changed via
1038 // the autofill dialog's account chooser and set explicitly on dialog submission 1042 // the autofill dialog's account chooser and set explicitly on dialog submission
1039 // (but not cancel). If this isn't set, the dialog assumes it's the first run. 1043 // (but not cancel). If this isn't set, the dialog assumes it's the first run.
1040 const char kAutofillDialogPayWithoutWallet[] = "autofill.pay_without_wallet"; 1044 const char kAutofillDialogPayWithoutWallet[] = "autofill.pay_without_wallet";
1041 1045
(...skipping 1286 matching lines...) Expand 10 before | Expand all | Expand 10 after
2328 // Whether DNS Quick Check is disabled in proxy resolution. 2332 // Whether DNS Quick Check is disabled in proxy resolution.
2329 const char kQuickCheckEnabled[] = "proxy.quick_check_enabled"; 2333 const char kQuickCheckEnabled[] = "proxy.quick_check_enabled";
2330 2334
2331 // Whether Guest Mode is enabled within the browser. 2335 // Whether Guest Mode is enabled within the browser.
2332 const char kBrowserGuestModeEnabled[] = "profile.browser_guest_enabled"; 2336 const char kBrowserGuestModeEnabled[] = "profile.browser_guest_enabled";
2333 2337
2334 // Whether Adding a new Person is enabled within the user manager. 2338 // Whether Adding a new Person is enabled within the user manager.
2335 const char kBrowserAddPersonEnabled[] = "profile.add_person_enabled"; 2339 const char kBrowserAddPersonEnabled[] = "profile.add_person_enabled";
2336 2340
2337 } // namespace prefs 2341 } // namespace prefs
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698