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@756 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-09-04 18:55:35 +00:00
parent 4c761a68f7
commit df879561ec
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/internal/cef_types.h
View File

@@ -1237,9 +1237,9 @@ typedef struct _cef_popup_features_t {
// Proxy types.
///
enum cef_proxy_type_t {
PROXY_TYPE_DIRECT = 0,
PROXY_TYPE_NAMED,
PROXY_TYPE_PAC_STRING,
CEF_PROXY_TYPE_DIRECT = 0,
CEF_PROXY_TYPE_NAMED,
CEF_PROXY_TYPE_PAC_STRING,
};
///

12
include/internal/cef_types_wrappers.h
View File

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