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

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

Issue 7342043: Fixed regression: various preferences were not persisted when changed from incognito window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments Created 9 years, 5 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
« no previous file with comments | « chrome/common/json_pref_store.cc ('k') | chrome/common/pref_store.h » ('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) 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 1309 matching lines...) Expand 10 before | Expand all | Expand 10 after
1320 const char kCloudPrintEmail[] = "cloud_print.email"; 1320 const char kCloudPrintEmail[] = "cloud_print.email";
1321 // Settings specific to underlying print system. 1321 // Settings specific to underlying print system.
1322 const char kCloudPrintPrintSystemSettings[] = 1322 const char kCloudPrintPrintSystemSettings[] =
1323 "cloud_print.print_system_settings"; 1323 "cloud_print.print_system_settings";
1324 // A boolean indicating whether we should poll for print jobs when don't have 1324 // A boolean indicating whether we should poll for print jobs when don't have
1325 // an XMPP connection (false by default). 1325 // an XMPP connection (false by default).
1326 const char kCloudPrintEnableJobPoll[] = "cloud_print.enable_job_poll"; 1326 const char kCloudPrintEnableJobPoll[] = "cloud_print.enable_job_poll";
1327 const char kCloudPrintRobotRefreshToken[] = "cloud_print.robot_refresh_token"; 1327 const char kCloudPrintRobotRefreshToken[] = "cloud_print.robot_refresh_token";
1328 const char kCloudPrintRobotEmail[] = "cloud_print.robot_email"; 1328 const char kCloudPrintRobotEmail[] = "cloud_print.robot_email";
1329 1329
1330 // Preference to story proxy settings. 1330 // Preference to store proxy settings.
1331 const char kProxy[] = "proxy"; 1331 const char kProxy[] = "proxy";
1332 const char kMaxConnectionsPerProxy[] = "net.max_connections_per_proxy"; 1332 const char kMaxConnectionsPerProxy[] = "net.max_connections_per_proxy";
1333 1333
1334 // Preferences that are exclusivly used to store managed values for default 1334 // Preferences that are exclusively used to store managed values for default
1335 // content settings. 1335 // content settings.
1336 const char kManagedDefaultCookiesSetting[] = 1336 const char kManagedDefaultCookiesSetting[] =
1337 "profile.managed_default_content_settings.cookies"; 1337 "profile.managed_default_content_settings.cookies";
1338 const char kManagedDefaultImagesSetting[] = 1338 const char kManagedDefaultImagesSetting[] =
1339 "profile.managed_default_content_settings.images"; 1339 "profile.managed_default_content_settings.images";
1340 const char kManagedDefaultJavaScriptSetting[] = 1340 const char kManagedDefaultJavaScriptSetting[] =
1341 "profile.managed_default_content_settings.javascript"; 1341 "profile.managed_default_content_settings.javascript";
1342 const char kManagedDefaultPluginsSetting[] = 1342 const char kManagedDefaultPluginsSetting[] =
1343 "profile.managed_default_content_settings.plugins"; 1343 "profile.managed_default_content_settings.plugins";
1344 const char kManagedDefaultPopupsSetting[] = 1344 const char kManagedDefaultPopupsSetting[] =
1345 "profile.managed_default_content_settings.popups"; 1345 "profile.managed_default_content_settings.popups";
1346 1346
1347 // Preferences that are exclusivly used to store managed 1347 // Preferences that are exclusively used to store managed
1348 // content settings patterns. 1348 // content settings patterns.
1349 const char kManagedCookiesAllowedForUrls[] = 1349 const char kManagedCookiesAllowedForUrls[] =
1350 "profile.managed_cookies_allowed_for_urls"; 1350 "profile.managed_cookies_allowed_for_urls";
1351 const char kManagedCookiesBlockedForUrls[] = 1351 const char kManagedCookiesBlockedForUrls[] =
1352 "profile.managed_cookies_blocked_for_urls"; 1352 "profile.managed_cookies_blocked_for_urls";
1353 const char kManagedCookiesSessionOnlyForUrls[] = 1353 const char kManagedCookiesSessionOnlyForUrls[] =
1354 "profile.managed_cookies_sessiononly_for_urls"; 1354 "profile.managed_cookies_sessiononly_for_urls";
1355 const char kManagedImagesAllowedForUrls[] = 1355 const char kManagedImagesAllowedForUrls[] =
1356 "profile.managed_images_allowed_for_urls"; 1356 "profile.managed_images_allowed_for_urls";
1357 const char kManagedImagesBlockedForUrls[] = 1357 const char kManagedImagesBlockedForUrls[] =
(...skipping 29 matching lines...) Expand all
1387 // Whether user-specified handlers for protocols and content types can be 1387 // Whether user-specified handlers for protocols and content types can be
1388 // specified. 1388 // specified.
1389 const char kCustomHandlersEnabled[] = "custom_handlers.enabled"; 1389 const char kCustomHandlersEnabled[] = "custom_handlers.enabled";
1390 1390
1391 // Integers that specify the policy refresh rate for device- and user-policy in 1391 // Integers that specify the policy refresh rate for device- and user-policy in
1392 // milliseconds. Not all values are meaningful, so it is clamped to a sane range 1392 // milliseconds. Not all values are meaningful, so it is clamped to a sane range
1393 // by the cloud policy subsystem. 1393 // by the cloud policy subsystem.
1394 const char kDevicePolicyRefreshRate[] = "policy.device_refresh_rate"; 1394 const char kDevicePolicyRefreshRate[] = "policy.device_refresh_rate";
1395 const char kUserPolicyRefreshRate[] = "policy.user_refresh_rate"; 1395 const char kUserPolicyRefreshRate[] = "policy.user_refresh_rate";
1396 } // namespace prefs 1396 } // namespace prefs
OLDNEW
« no previous file with comments | « chrome/common/json_pref_store.cc ('k') | chrome/common/pref_store.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698