| 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 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h" | 5 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h" |
| 6 | 6 |
| 7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
| 8 #include "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
| 9 #include "base/prefs/scoped_user_pref_update.h" | 9 #include "base/prefs/scoped_user_pref_update.h" |
| 10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 if (!data_reduction_proxy::DataReductionProxyConfigurator:: | 45 if (!data_reduction_proxy::DataReductionProxyConfigurator:: |
| 46 ContainsDataReductionProxy(proxy_rules)) { | 46 ContainsDataReductionProxy(proxy_rules)) { |
| 47 return; | 47 return; |
| 48 } | 48 } |
| 49 dict->SetString("mode", ProxyModeToString(ProxyPrefs::MODE_SYSTEM)); | 49 dict->SetString("mode", ProxyModeToString(ProxyPrefs::MODE_SYSTEM)); |
| 50 dict->SetString("server", ""); | 50 dict->SetString("server", ""); |
| 51 dict->SetString("bypass_list", ""); | 51 dict->SetString("bypass_list", ""); |
| 52 } | 52 } |
| 53 | 53 |
| 54 DataReductionProxyChromeSettings::DataReductionProxyChromeSettings( | 54 DataReductionProxyChromeSettings::DataReductionProxyChromeSettings( |
| 55 DataReductionProxyParams* params) : DataReductionProxySettings(params) { | 55 scoped_ptr<DataReductionProxyParams> params) |
| 56 : DataReductionProxySettings(params.Pass()) { |
| 56 } | 57 } |
| 57 | 58 |
| 58 DataReductionProxyChromeSettings::~DataReductionProxyChromeSettings() { | 59 DataReductionProxyChromeSettings::~DataReductionProxyChromeSettings() { |
| 59 } | 60 } |
| 60 | 61 |
| 61 void DataReductionProxyChromeSettings::InitDataReductionProxySettings( | 62 void DataReductionProxyChromeSettings::InitDataReductionProxySettings( |
| 62 data_reduction_proxy::DataReductionProxyIOData* io_data, | 63 data_reduction_proxy::DataReductionProxyIOData* io_data, |
| 63 PrefService* profile_prefs, | 64 PrefService* profile_prefs, |
| 64 PrefService* local_state_prefs, | 65 PrefService* local_state_prefs, |
| 65 net::URLRequestContextGetter* request_context) { | 66 net::URLRequestContextGetter* request_context) { |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 #elif defined(OS_OPENBSD) | 105 #elif defined(OS_OPENBSD) |
| 105 return Client::CHROME_OPENBSD; | 106 return Client::CHROME_OPENBSD; |
| 106 #elif defined(OS_SOLARIS) | 107 #elif defined(OS_SOLARIS) |
| 107 return Client::CHROME_SOLARIS; | 108 return Client::CHROME_SOLARIS; |
| 108 #elif defined(OS_QNX) | 109 #elif defined(OS_QNX) |
| 109 return Client::CHROME_QNX; | 110 return Client::CHROME_QNX; |
| 110 #else | 111 #else |
| 111 return Client::UNKNOWN; | 112 return Client::UNKNOWN; |
| 112 #endif | 113 #endif |
| 113 } | 114 } |
| OLD | NEW |