diff --git a/include/internal/cef_types.h b/include/internal/cef_types.h index 2cf76b18c..bd36a6237 100644 --- a/include/internal/cef_types.h +++ b/include/internal/cef_types.h @@ -1060,9 +1060,9 @@ enum cef_dom_node_type_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, }; /// diff --git a/include/internal/cef_types_wrappers.h b/include/internal/cef_types_wrappers.h index 196b5de84..155404c47 100644 --- a/include/internal/cef_types_wrappers.h +++ b/include/internal/cef_types_wrappers.h @@ -625,7 +625,7 @@ public: /// void UseDirect() { - proxyType = PROXY_TYPE_DIRECT; + proxyType = CEF_PROXY_TYPE_DIRECT; } /// @@ -639,7 +639,7 @@ public: /// void UseNamedProxy(const CefString& proxy_uri_list) { - proxyType = PROXY_TYPE_NAMED; + proxyType = CEF_PROXY_TYPE_NAMED; (CefString(&proxyList)) = proxy_uri_list; } @@ -649,13 +649,13 @@ public: /// 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); } }; diff --git a/tests/cefclient/cefclient.cpp b/tests/cefclient/cefclient.cpp index 3320ab435..7ba9245ff 100644 --- a/tests/cefclient/cefclient.cpp +++ b/tests/cefclient/cefclient.cpp @@ -258,21 +258,21 @@ void AppGetSettings(CefSettings& settings, CefRefPtr& app) // Retrieve command-line proxy configuration, if any. 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; if (g_command_line->HasSwitch(cefclient::kProxyType)) { std::string str = g_command_line->GetSwitchValue(cefclient::kProxyType); if (str == cefclient::kProxyType_Direct) { has_proxy = true; - proxy_type = PROXY_TYPE_DIRECT; + proxy_type = CEF_PROXY_TYPE_DIRECT; } else if (str == cefclient::kProxyType_Named || str == cefclient::kProxyType_Pac) { proxy_config = g_command_line->GetSwitchValue(cefclient::kProxyConfig); if (!proxy_config.empty()) { has_proxy = true; proxy_type = (str == cefclient::kProxyType_Named? - PROXY_TYPE_NAMED:PROXY_TYPE_PAC_STRING); + CEF_PROXY_TYPE_NAMED:CEF_PROXY_TYPE_PAC_STRING); } } }