Skip to content

Commit 767ae41

Browse files
cztomczakcztomczak
committed
Rename files to remove _cef3 postfix and update includes. Issue cztomczak#106.
Delete remaining CEF 1 files (download_handler.pyx, cef_v8*.pxd, v8function_handler.pxd, cef_download_handler.pxd, download_handler.pxd, cef_render_handler.pxd).
1 parent e79d6bf commit 767ae41

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+273
-637
lines changed

cefpython/browser_process_handler_cef3.pyx renamed to cefpython/browser_process_handler.pyx

File renamed without changes.

cefpython/callback_cef3.pyx renamed to cefpython/callback.pyx

File renamed without changes.

‎cefpython/cefpython.pyx‎

Lines changed: 26 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -156,55 +156,32 @@ include "task.pyx"
156156
include "javascript_bindings.pyx"
157157
include "virtual_keys.pyx"
158158

159-
IF CEF_VERSION == 1:
160-
include "window_info_cef1.pyx"
161-
include "cookie_cef1.pyx"
162-
include "load_handler_cef1.pyx"
163-
include "keyboard_handler_cef1.pyx"
164-
include "request_cef1.pyx"
165-
include "web_request_cef1.pyx"
166-
include "request_handler_cef1.pyx"
167-
include "response_cef1.pyx"
168-
include "display_handler_cef1.pyx"
169-
include "lifespan_handler_cef1.pyx"
170-
IF UNAME_SYSNAME == "Windows":
171-
# Off-screen rendering currently supported only on Windows.
172-
include "render_handler_cef1.pyx"
173-
include "download_handler.pyx"
174-
include "v8context_handler_cef1.pyx"
175-
include "v8function_handler_cef1.pyx"
176-
include "v8utils_cef1.pyx"
177-
include "javascript_callback_cef1.pyx"
178-
include "python_callback_cef1.pyx"
179-
include "network_error_cef1.pyx"
180-
181-
IF CEF_VERSION == 3:
182-
include "window_info_cef3.pyx"
183-
include "process_message_utils.pyx"
184-
include "v8context_handler_cef3.pyx"
185-
include "v8function_handler_cef3.pyx"
186-
include "javascript_callback_cef3.pyx"
187-
include "python_callback_cef3.pyx"
188-
include "lifespan_handler_cef3.pyx"
189-
include "display_handler_cef3.pyx"
190-
include "keyboard_handler_cef3.pyx"
191-
include "web_plugin_info_cef3.pyx"
192-
include "request_cef3.pyx"
193-
include "request_handler_cef3.pyx"
194-
include "cookie_cef3.pyx"
195-
include "string_visitor_cef3.pyx"
196-
include "load_handler_cef3.pyx"
197-
include "network_error_cef3.pyx"
198-
include "browser_process_handler_cef3.pyx"
199-
include "paint_buffer_cef3.pyx"
200-
include "render_handler_cef3.pyx"
201-
include "callback_cef3.pyx"
202-
include "resource_handler_cef3.pyx"
203-
include "response_cef3.pyx"
204-
include "web_request_cef3.pyx"
205-
include "command_line.pyx"
206-
include "app.pyx"
207-
include "javascript_dialog_handler.pyx"
159+
include "window_info.pyx"
160+
include "process_message_utils.pyx"
161+
include "v8context_handler.pyx"
162+
include "v8function_handler.pyx"
163+
include "javascript_callback.pyx"
164+
include "python_callback.pyx"
165+
include "lifespan_handler.pyx"
166+
include "display_handler.pyx"
167+
include "keyboard_handler.pyx"
168+
include "web_plugin_info.pyx"
169+
include "request.pyx"
170+
include "request_handler.pyx"
171+
include "cookie.pyx"
172+
include "string_visitor.pyx"
173+
include "load_handler.pyx"
174+
include "network_error.pyx"
175+
include "browser_process_handler.pyx"
176+
include "paint_buffer.pyx"
177+
include "render_handler.pyx"
178+
include "callback.pyx"
179+
include "resource_handler.pyx"
180+
include "response.pyx"
181+
include "web_request.pyx"
182+
include "command_line.pyx"
183+
include "app.pyx"
184+
include "javascript_dialog_handler.pyx"
208185

209186
# -----------------------------------------------------------------------------
210187
# Utility functions to provide settings to the C++ browser process code.

cefpython/cookie_cef3.pyx renamed to cefpython/cookie.pyx

File renamed without changes.

cefpython/cython_includes/cef_callback_cef3.pxd renamed to cefpython/cython_includes/cef_callback.pxd

File renamed without changes.

cefpython/cython_includes/cef_cookie_cef3.pxd renamed to cefpython/cython_includes/cef_cookie.pxd

File renamed without changes.

‎cefpython/cython_includes/cef_cookie_manager_namespace.pxd‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@ include "compile_time_constants.pxi"
22

33
from libcpp cimport bool as cpp_bool
44
from cef_string cimport CefString
5-
6-
IF CEF_VERSION == 1:
7-
from cef_cookie_cef1 cimport CefCookie
8-
ELIF CEF_VERSION == 3:
9-
from cef_cookie_cef3 cimport CefCookie
5+
from cef_cookie cimport CefCookie
106

117
# We need to pass C++ class methods by reference to a function,
128
# it is not possible with such syntax:

‎cefpython/cython_includes/cef_download_handler.pxd‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎cefpython/cython_includes/cef_render_handler.pxd‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

cefpython/cython_includes/cef_request_cef3.pxd renamed to cefpython/cython_includes/cef_request.pxd

File renamed without changes.

0 commit comments

Comments
 (0)