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

Side by Side Diff: chrome_proxy_resolver.h

Issue 5205002: AU: Manual proxy support (Closed) Base URL: http://git.chromium.org/git/update_engine.git@master
Patch Set: missed one fix for review Created 10 years, 1 month 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 | « SConstruct ('k') | chrome_proxy_resolver.cc » ('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) 2010 The Chromium OS Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium OS 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 CHROMEOS_PLATFORM_UPDATE_ENGINE_CHROME_PROXY_RESOLVER_H__ 5 #ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_CHROME_PROXY_RESOLVER_H__
6 #define CHROMEOS_PLATFORM_UPDATE_ENGINE_CHROME_PROXY_RESOLVER_H__ 6 #define CHROMEOS_PLATFORM_UPDATE_ENGINE_CHROME_PROXY_RESOLVER_H__
7 7
8 #include <deque>
8 #include <string> 9 #include <string>
9 #include <vector>
10 10
11 #include <curl/curl.h> 11 #include <curl/curl.h>
12 #include <gtest/gtest_prod.h> // for FRIEND_TEST 12 #include <gtest/gtest_prod.h> // for FRIEND_TEST
13 13
14 #include "update_engine/dbus_interface.h" 14 #include "update_engine/dbus_interface.h"
15 #include "update_engine/proxy_resolver.h" 15 #include "update_engine/proxy_resolver.h"
16 16
17 namespace chromeos_update_engine { 17 namespace chromeos_update_engine {
18 18
19 extern const char kSessionManagerService[]; 19 extern const char kSessionManagerService[];
20 extern const char kSessionManagerPath[]; 20 extern const char kSessionManagerPath[];
21 extern const char kSessionManagerInterface[]; 21 extern const char kSessionManagerInterface[];
22 extern const char kSessionManagerRetrievePropertyMethod[]; 22 extern const char kSessionManagerRetrievePropertyMethod[];
23 extern const char kSessionManagerProxySettingsKey[]; 23 extern const char kSessionManagerProxySettingsKey[];
24 24
25 // Class to resolve proxy for a url based on Chrome's proxy settings. 25 // Class to resolve proxy for a url based on Chrome's proxy settings.
26 26
27 // Currently only supports manual settings, not PAC files or autodetected 27 // Currently only supports manual settings, not PAC files or autodetected
28 // settings. 28 // settings.
29 29
30 class ChromeProxyResolver : public ProxyResolver { 30 class ChromeProxyResolver : public ProxyResolver {
31 public: 31 public:
32 explicit ChromeProxyResolver(DbusGlibInterface* dbus) : dbus_(dbus) {} 32 explicit ChromeProxyResolver(DbusGlibInterface* dbus) : dbus_(dbus) {}
33 virtual ~ChromeProxyResolver() {} 33 virtual ~ChromeProxyResolver() {}
34 34
35 virtual bool GetProxiesForUrl(const std::string& url, 35 virtual bool GetProxiesForUrl(const std::string& url,
36 std::vector<std::string>* out_proxies); 36 std::deque<std::string>* out_proxies);
37 37
38 // Get the curl proxy type for a given proxy url. Returns true on success. 38 // Get the curl proxy type for a given proxy url. Returns true on success.
39 // Note: if proxy is kNoProxy, this will return false. 39 // Note: if proxy is kNoProxy, this will return false.
40 static bool GetProxyType(const std::string& proxy, 40 static bool GetProxyType(const std::string& proxy, curl_proxytype* out_type);
41 curl_proxytype* out_type);
42 41
43 private: 42 private:
44 FRIEND_TEST(ChromeProxyResolverTest, GetProxiesForUrlWithSettingsTest); 43 FRIEND_TEST(ChromeProxyResolverTest, GetProxiesForUrlWithSettingsTest);
45 44
46 // Fetches a dbus proxy to session manager. Returns NULL on failure. 45 // Fetches a dbus proxy to session manager. Returns NULL on failure.
47 DBusGProxy* DbusProxy(); 46 DBusGProxy* DbusProxy();
48 47
49 // Fetches the json-encoded proxy settings string from the session manager. 48 // Fetches the json-encoded proxy settings string from the session manager.
50 bool GetJsonProxySettings(DBusGProxy* proxy, std::string* out_json); 49 bool GetJsonProxySettings(DBusGProxy* proxy, std::string* out_json);
51 50
52 // Given a |url| and the json encoded settings |json_settings|, 51 // Given a |url| and the json encoded settings |json_settings|,
53 // returns the proper proxy servers in |out_proxies|. Returns true on 52 // returns the proper proxy servers in |out_proxies|. Returns true on
54 // success. 53 // success.
55 bool GetProxiesForUrlWithSettings(const std::string& url, 54 bool GetProxiesForUrlWithSettings(const std::string& url,
56 const std::string& json_settings, 55 const std::string& json_settings,
57 std::vector<std::string>* out_proxies); 56 std::deque<std::string>* out_proxies);
58 57
59 DbusGlibInterface* dbus_; 58 DbusGlibInterface* dbus_;
60 59
61 DISALLOW_COPY_AND_ASSIGN(ChromeProxyResolver); 60 DISALLOW_COPY_AND_ASSIGN(ChromeProxyResolver);
62 }; 61 };
63 62
64 } // namespace chromeos_update_engine 63 } // namespace chromeos_update_engine
65 64
66 #endif // CHROMEOS_PLATFORM_UPDATE_ENGINE_CHROME_PROXY_RESOLVER_H__ 65 #endif // CHROMEOS_PLATFORM_UPDATE_ENGINE_CHROME_PROXY_RESOLVER_H__
OLDNEW
« no previous file with comments | « SConstruct ('k') | chrome_proxy_resolver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698