Merge branch 'HEAD' of https://code.google.com/p/cefpython/

cztomczak · cztomczak · commit 70988059dac3 · 2014-08-01T15:25:15.000+02:00
diff --git a/cefpython/cef3/linux/binaries_32bit/wxpython-response.py b/cefpython/cef3/linux/binaries_32bit/wxpython-response.py
@@ -1,12 +1,14 @@
+# An example of embedding CEF browser in wxPython on Linux.
+# Tested with wxPython 2.8.12.1 (gtk2-unicode).
+# To install wxPython type "sudo apt-get install python-wxtools".
+
 # This example implements a custom "_OnResourceResponse" callback
 # that emulates reading response by utilizing Resourcehandler
 # and WebRequest.
 
 FIX_ENCODING_BUG = True
 BROWSER_DEFAULT_ENCODING = "utf-8"
 
-# An example of embedding CEF browser in wxPython on Linux.
-
 # The official CEF Python binaries come with tcmalloc hook
 # disabled. But if you've built custom binaries and kept tcmalloc
 # hook enabled, then be aware that in such case it is required
diff --git a/cefpython/cef3/linux/binaries_32bit/wxpython.py b/cefpython/cef3/linux/binaries_32bit/wxpython.py
@@ -1,4 +1,6 @@
 # An example of embedding CEF browser in wxPython on Linux.
+# Tested with wxPython 2.8.12.1 (gtk2-unicode).
+# To install wxPython type "sudo apt-get install python-wxtools".
 
 # The official CEF Python binaries come with tcmalloc hook
 # disabled. But if you've built custom binaries and kept tcmalloc
@@ -724,14 +726,12 @@ def GetSources():
     # browser, see the call to CreateBrowserSync.
     g_browserSettings = {
         # "plugins_disabled": True,
-         "file_access_from_file_urls_allowed": True,
-         "universal_access_from_file_urls_allowed": True,
+        # "file_access_from_file_urls_allowed": True,
+        # "universal_access_from_file_urls_allowed": True,
     }
     
     # Command line switches set programmatically
     switches = {
-         "allow-file-access-from-files": "",
-         "allow-file-access": "",
         # "proxy-server": "socks5://127.0.0.1:8888",
         # "no-proxy-server": "",
         # "enable-media-stream": "",
diff --git a/cefpython/cef3/linux/binaries_64bit/wxpython-response.py b/cefpython/cef3/linux/binaries_64bit/wxpython-response.py
@@ -1,12 +1,14 @@
+# An example of embedding CEF browser in wxPython on Linux.
+# Tested with wxPython 2.8.12.1 (gtk2-unicode).
+# To install wxPython type "sudo apt-get install python-wxtools".
+
 # This example implements a custom "_OnResourceResponse" callback
 # that emulates reading response by utilizing Resourcehandler
 # and WebRequest.
 
 FIX_ENCODING_BUG = True
 BROWSER_DEFAULT_ENCODING = "utf-8"
 
-# An example of embedding CEF browser in wxPython on Linux.
-
 # The official CEF Python binaries come with tcmalloc hook
 # disabled. But if you've built custom binaries and kept tcmalloc
 # hook enabled, then be aware that in such case it is required
diff --git a/cefpython/cef3/linux/binaries_64bit/wxpython.py b/cefpython/cef3/linux/binaries_64bit/wxpython.py
@@ -1,4 +1,6 @@
 # An example of embedding CEF browser in wxPython on Linux.
+# Tested with wxPython 2.8.12.1 (gtk2-unicode).
+# To install wxPython type "sudo apt-get install python-wxtools".
 
 # The official CEF Python binaries come with tcmalloc hook
 # disabled. But if you've built custom binaries and kept tcmalloc
@@ -724,14 +726,12 @@ def GetSources():
     # browser, see the call to CreateBrowserSync.
     g_browserSettings = {
         # "plugins_disabled": True,
-         "file_access_from_file_urls_allowed": True,
-         "universal_access_from_file_urls_allowed": True,
+        # "file_access_from_file_urls_allowed": True,
+        # "universal_access_from_file_urls_allowed": True,
     }
     
     # Command line switches set programmatically
     switches = {
-         "allow-file-access-from-files": "",
-         "allow-file-access": "",
         # "proxy-server": "socks5://127.0.0.1:8888",
         # "no-proxy-server": "",
         # "enable-media-stream": "",
