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 #ifndef COMPONENTS_PROXY_CONFIG_PROXY_CONFIG_DICTIONARY_H_ | 5 #ifndef COMPONENTS_PROXY_CONFIG_PROXY_CONFIG_DICTIONARY_H_ |
6 #define COMPONENTS_PROXY_CONFIG_PROXY_CONFIG_DICTIONARY_H_ | 6 #define COMPONENTS_PROXY_CONFIG_PROXY_CONFIG_DICTIONARY_H_ |
7 | 7 |
| 8 #include <memory> |
8 #include <string> | 9 #include <string> |
9 | 10 |
10 #include "base/macros.h" | 11 #include "base/macros.h" |
11 #include "base/memory/scoped_ptr.h" | |
12 #include "components/proxy_config/proxy_config_export.h" | 12 #include "components/proxy_config/proxy_config_export.h" |
13 #include "components/proxy_config/proxy_prefs.h" | 13 #include "components/proxy_config/proxy_prefs.h" |
14 | 14 |
15 namespace base { | 15 namespace base { |
16 class DictionaryValue; | 16 class DictionaryValue; |
17 } | 17 } |
18 | 18 |
19 namespace net { | 19 namespace net { |
20 class ProxyServer; | 20 class ProxyServer; |
21 } | 21 } |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 std::string* spec); | 60 std::string* spec); |
61 | 61 |
62 private: | 62 private: |
63 static base::DictionaryValue* CreateDictionary( | 63 static base::DictionaryValue* CreateDictionary( |
64 ProxyPrefs::ProxyMode mode, | 64 ProxyPrefs::ProxyMode mode, |
65 const std::string& pac_url, | 65 const std::string& pac_url, |
66 bool pac_mandatory, | 66 bool pac_mandatory, |
67 const std::string& proxy_server, | 67 const std::string& proxy_server, |
68 const std::string& bypass_list); | 68 const std::string& bypass_list); |
69 | 69 |
70 scoped_ptr<base::DictionaryValue> dict_; | 70 std::unique_ptr<base::DictionaryValue> dict_; |
71 | 71 |
72 DISALLOW_COPY_AND_ASSIGN(ProxyConfigDictionary); | 72 DISALLOW_COPY_AND_ASSIGN(ProxyConfigDictionary); |
73 }; | 73 }; |
74 | 74 |
75 #endif // COMPONENTS_PROXY_CONFIG_PROXY_CONFIG_DICTIONARY_H_ | 75 #endif // COMPONENTS_PROXY_CONFIG_PROXY_CONFIG_DICTIONARY_H_ |
OLD | NEW |