| OLD | NEW |
| 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/browser/ui/options/options_util.h" | 5 #include "chrome/browser/ui/options/options_util.h" |
| 6 | 6 |
| 7 #include "base/threading/thread_restrictions.h" | 7 #include "base/threading/thread_restrictions.h" |
| 8 #include "chrome/browser/browser_process.h" | 8 #include "chrome/browser/browser_process.h" |
| 9 #include "chrome/browser/content_settings/host_content_settings_map.h" | 9 #include "chrome/browser/content_settings/host_content_settings_map.h" |
| 10 #include "chrome/browser/download/download_manager.h" | 10 #include "chrome/browser/download/download_manager.h" |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 prefs::kClearSiteDataOnExit, | 30 prefs::kClearSiteDataOnExit, |
| 31 prefs::kCookieBehavior, | 31 prefs::kCookieBehavior, |
| 32 prefs::kDefaultCharset, | 32 prefs::kDefaultCharset, |
| 33 prefs::kDefaultZoomLevel, | 33 prefs::kDefaultZoomLevel, |
| 34 prefs::kDeleteBrowsingHistory, | 34 prefs::kDeleteBrowsingHistory, |
| 35 prefs::kDeleteCache, | 35 prefs::kDeleteCache, |
| 36 prefs::kDeleteCookies, | 36 prefs::kDeleteCookies, |
| 37 prefs::kDeleteDownloadHistory, | 37 prefs::kDeleteDownloadHistory, |
| 38 prefs::kDeleteFormData, | 38 prefs::kDeleteFormData, |
| 39 prefs::kDeletePasswords, | 39 prefs::kDeletePasswords, |
| 40 prefs::kDnsPrefetchingEnabled, | 40 prefs::kNetworkPredictionEnabled, |
| 41 // TODO(rtenneti): Remove ssl preferences from user_prefs when we stop | 41 // TODO(rtenneti): Remove ssl preferences from user_prefs when we stop |
| 42 // migrating user_prefs to local_state after 6 months (after we delete | 42 // migrating user_prefs to local_state after 6 months (after we delete |
| 43 // migration code). | 43 // migration code). |
| 44 prefs::kCertRevocationCheckingEnabled, | 44 prefs::kCertRevocationCheckingEnabled, |
| 45 prefs::kSSL3Enabled, | 45 prefs::kSSL3Enabled, |
| 46 prefs::kTLS1Enabled, | 46 prefs::kTLS1Enabled, |
| 47 #if defined(OS_CHROMEOS) | 47 #if defined(OS_CHROMEOS) |
| 48 prefs::kTapToClickEnabled, | 48 prefs::kTapToClickEnabled, |
| 49 prefs::kTouchpadSensitivity, | 49 prefs::kTouchpadSensitivity, |
| 50 #endif | 50 #endif |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 if (metrics) { | 127 if (metrics) { |
| 128 metrics->SetUserPermitsUpload(enabled); | 128 metrics->SetUserPermitsUpload(enabled); |
| 129 if (enabled) | 129 if (enabled) |
| 130 metrics->Start(); | 130 metrics->Start(); |
| 131 else | 131 else |
| 132 metrics->Stop(); | 132 metrics->Stop(); |
| 133 } | 133 } |
| 134 | 134 |
| 135 return enabled; | 135 return enabled; |
| 136 } | 136 } |
| OLD | NEW |