| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #ifndef CHROME_BROWSER_NET_SPDYPROXY_DATA_REDUCTION_PROXY_CHROME_SETTINGS_H_ | 5 #ifndef CHROME_BROWSER_NET_SPDYPROXY_DATA_REDUCTION_PROXY_CHROME_SETTINGS_H_ |
| 6 #define CHROME_BROWSER_NET_SPDYPROXY_DATA_REDUCTION_PROXY_CHROME_SETTINGS_H_ | 6 #define CHROME_BROWSER_NET_SPDYPROXY_DATA_REDUCTION_PROXY_CHROME_SETTINGS_H_ |
| 7 | 7 |
| 8 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_requ
est_options.h" | 8 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_requ
est_options.h" |
| 9 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_sett
ings.h" | 9 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_sett
ings.h" |
| 10 #include "components/keyed_service/core/keyed_service.h" | 10 #include "components/keyed_service/core/keyed_service.h" |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 // Enum values that can be reported for the | 34 // Enum values that can be reported for the |
| 35 // DataReductionProxy.ProxyPrefMigrationResult histogram. These values must be | 35 // DataReductionProxy.ProxyPrefMigrationResult histogram. These values must be |
| 36 // kept in sync with their counterparts in histograms.xml. Visible here for | 36 // kept in sync with their counterparts in histograms.xml. Visible here for |
| 37 // testing purposes. | 37 // testing purposes. |
| 38 enum ProxyPrefMigrationResult { | 38 enum ProxyPrefMigrationResult { |
| 39 PROXY_PREF_NOT_CLEARED = 0, | 39 PROXY_PREF_NOT_CLEARED = 0, |
| 40 PROXY_PREF_CLEARED_EMPTY, | 40 PROXY_PREF_CLEARED_EMPTY, |
| 41 PROXY_PREF_CLEARED_MODE_SYSTEM, | 41 PROXY_PREF_CLEARED_MODE_SYSTEM, |
| 42 PROXY_PREF_CLEARED_DRP, | 42 PROXY_PREF_CLEARED_DRP, |
| 43 PROXY_PREF_CLEARED_GOOGLEZIP, | 43 PROXY_PREF_CLEARED_GOOGLEZIP, |
| 44 PROXY_PREF_CLEARED_PAC_GOOGLEZIP, |
| 44 PROXY_PREF_MAX | 45 PROXY_PREF_MAX |
| 45 }; | 46 }; |
| 46 | 47 |
| 47 // Constructs a settings object. Construction and destruction must happen on | 48 // Constructs a settings object. Construction and destruction must happen on |
| 48 // the UI thread. | 49 // the UI thread. |
| 49 DataReductionProxyChromeSettings(); | 50 DataReductionProxyChromeSettings(); |
| 50 | 51 |
| 51 // Destructs the settings object. | 52 // Destructs the settings object. |
| 52 ~DataReductionProxyChromeSettings() override; | 53 ~DataReductionProxyChromeSettings() override; |
| 53 | 54 |
| (...skipping 18 matching lines...) Expand all Loading... |
| 72 // Helper method for migrating the Data Reduction Proxy away from using the | 73 // Helper method for migrating the Data Reduction Proxy away from using the |
| 73 // proxy pref. Returns the ProxyPrefMigrationResult value indicating the | 74 // proxy pref. Returns the ProxyPrefMigrationResult value indicating the |
| 74 // migration action taken. | 75 // migration action taken. |
| 75 ProxyPrefMigrationResult MigrateDataReductionProxyOffProxyPrefsHelper( | 76 ProxyPrefMigrationResult MigrateDataReductionProxyOffProxyPrefsHelper( |
| 76 PrefService* prefs); | 77 PrefService* prefs); |
| 77 | 78 |
| 78 DISALLOW_COPY_AND_ASSIGN(DataReductionProxyChromeSettings); | 79 DISALLOW_COPY_AND_ASSIGN(DataReductionProxyChromeSettings); |
| 79 }; | 80 }; |
| 80 | 81 |
| 81 #endif // CHROME_BROWSER_NET_SPDYPROXY_DATA_REDUCTION_PROXY_CHROME_SETTINGS_H_ | 82 #endif // CHROME_BROWSER_NET_SPDYPROXY_DATA_REDUCTION_PROXY_CHROME_SETTINGS_H_ |
| OLD | NEW |