bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename PROXY_TYPE values to avoid naming conflict (issue #548).

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@757 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-09-04 18:55:58 +00:00
parent df879561ec
commit 7185bed3b9
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cef1/include/internal/cef_types.h
View File

@ -1097,9 +1097,9 @@ enum cef_dom_node_type_t {
// Proxy types. // Proxy types.
/// ///
enum cef_proxy_type_t { enum cef_proxy_type_t {
PROXY_TYPE_DIRECT = 0, CEF_PROXY_TYPE_DIRECT = 0,
PROXY_TYPE_NAMED, CEF_PROXY_TYPE_NAMED,
PROXY_TYPE_PAC_STRING, CEF_PROXY_TYPE_PAC_STRING,
}; };
/// ///

12
cef1/include/internal/cef_types_wrappers.h
View File

@ -606,7 +606,7 @@ class CefProxyInfo : public CefStructBase<CefProxyInfoTraits> {
// Use a direction connection instead of a proxy. // Use a direction connection instead of a proxy.
/// ///
void UseDirect() { void UseDirect() {
proxyType = PROXY_TYPE_DIRECT; proxyType = CEF_PROXY_TYPE_DIRECT;
} }
/// ///
@ -619,7 +619,7 @@ class CefProxyInfo : public CefStructBase<CefProxyInfoTraits> {
// "foo1:80;foo2:80". // "foo1:80;foo2:80".
/// ///
void UseNamedProxy(const CefString& proxy_uri_list) { void UseNamedProxy(const CefString& proxy_uri_list) {
proxyType = PROXY_TYPE_NAMED; proxyType = CEF_PROXY_TYPE_NAMED;
(CefString(&proxyList)) = proxy_uri_list; (CefString(&proxyList)) = proxy_uri_list;
} }
@ -628,13 +628,13 @@ class CefProxyInfo : public CefStructBase<CefProxyInfoTraits> {
// example, "PROXY foobar:99; SOCKS fml:2; DIRECT". // example, "PROXY foobar:99; SOCKS fml:2; DIRECT".
/// ///
void UsePacString(const CefString& pac_string) { void UsePacString(const CefString& pac_string) {
proxyType = PROXY_TYPE_PAC_STRING; proxyType = CEF_PROXY_TYPE_PAC_STRING;
(CefString(&proxyList)) = pac_string; (CefString(&proxyList)) = pac_string;
} }
bool IsDirect() const { return proxyType == PROXY_TYPE_DIRECT; } bool IsDirect() const { return proxyType == CEF_PROXY_TYPE_DIRECT; }
bool IsNamedProxy() const { return proxyType == PROXY_TYPE_NAMED; } bool IsNamedProxy() const { return proxyType == CEF_PROXY_TYPE_NAMED; }
bool IsPacString() const { return proxyType == PROXY_TYPE_PAC_STRING; } bool IsPacString() const { return proxyType == CEF_PROXY_TYPE_PAC_STRING; }
CefString ProxyList() const { return CefString(&proxyList); } CefString ProxyList() const { return CefString(&proxyList); }
}; };

6
cef1/tests/cefclient/cefclient.cpp
View File

@ -260,21 +260,21 @@ void AppGetSettings(CefSettings& settings, CefRefPtr<CefApp>& app) {
// Retrieve command-line proxy configuration, if any. // Retrieve command-line proxy configuration, if any.
bool has_proxy = false; bool has_proxy = false;
cef_proxy_type_t proxy_type = PROXY_TYPE_DIRECT; cef_proxy_type_t proxy_type = CEF_PROXY_TYPE_DIRECT;
CefString proxy_config; CefString proxy_config;
if (g_command_line->HasSwitch(cefclient::kProxyType)) { if (g_command_line->HasSwitch(cefclient::kProxyType)) {
std::string str = g_command_line->GetSwitchValue(cefclient::kProxyType); std::string str = g_command_line->GetSwitchValue(cefclient::kProxyType);
if (str == cefclient::kProxyType_Direct) { if (str == cefclient::kProxyType_Direct) {
has_proxy = true; has_proxy = true;
proxy_type = PROXY_TYPE_DIRECT; proxy_type = CEF_PROXY_TYPE_DIRECT;
} else if (str == cefclient::kProxyType_Named || } else if (str == cefclient::kProxyType_Named ||
str == cefclient::kProxyType_Pac) { str == cefclient::kProxyType_Pac) {
proxy_config = g_command_line->GetSwitchValue(cefclient::kProxyConfig); proxy_config = g_command_line->GetSwitchValue(cefclient::kProxyConfig);
if (!proxy_config.empty()) { if (!proxy_config.empty()) {
has_proxy = true; has_proxy = true;
proxy_type = (str == cefclient::kProxyType_Named? proxy_type = (str == cefclient::kProxyType_Named?
PROXY_TYPE_NAMED:PROXY_TYPE_PAC_STRING); CEF_PROXY_TYPE_NAMED:CEF_PROXY_TYPE_PAC_STRING);
} }
} }
} }