From df879561ec4f488bf9e2b88a004665e9b7f96dc4 Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Tue, 4 Sep 2012 18:55:35 +0000
Subject: [PATCH] Rename PROXY_TYPE values to avoid naming conflict (issue
 #548).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@756 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
---
 include/internal/cef_types.h          |  6 +++---
 include/internal/cef_types_wrappers.h | 12 ++++++------
 tests/cefclient/cefclient.cpp         |  6 +++---
 tests/cefclient/client_app.cpp        |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/include/internal/cef_types.h b/include/internal/cef_types.h
index 0d6cea0ff..2b4b157f9 100644
--- a/include/internal/cef_types.h
+++ b/include/internal/cef_types.h
@@ -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,
 };
 
 ///
diff --git a/include/internal/cef_types_wrappers.h b/include/internal/cef_types_wrappers.h
index 115a4cc4b..6456716ce 100644
--- a/include/internal/cef_types_wrappers.h
+++ b/include/internal/cef_types_wrappers.h
@@ -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); }
 };
diff --git a/tests/cefclient/cefclient.cpp b/tests/cefclient/cefclient.cpp
index caa0683f5..f170d296f 100644
--- a/tests/cefclient/cefclient.cpp
+++ b/tests/cefclient/cefclient.cpp
@@ -79,21 +79,21 @@ void AppGetSettings(CefSettings& settings, CefRefPtr<ClientApp> 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);
       }
     }
   }
diff --git a/tests/cefclient/client_app.cpp b/tests/cefclient/client_app.cpp
index 0e91ed55b..0ccb10e3b 100644
--- a/tests/cefclient/client_app.cpp
+++ b/tests/cefclient/client_app.cpp
@@ -175,7 +175,7 @@ class ClientAppExtensionHandler : public CefV8Handler {
 
 
 ClientApp::ClientApp()
-    : proxy_type_(PROXY_TYPE_DIRECT) {
+    : proxy_type_(CEF_PROXY_TYPE_DIRECT) {
   CreateRenderDelegates(render_delegates_);
 
   // Default schemes that support cookies.