Skip to content

Commit d271b98

Browse files
- Add about:version, about:credits and about:license internal URLs (issue #731).
- Centralize retrieval of the CEF major version number from a new VERSION file. git-svn-id: http://chromiumembedded.googlecode.com/svn/trunk/cef3@845 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
1 parent f5835e4 commit d271b98

25 files changed

+915
-171
lines changed

VERSION

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
CEF_MAJOR=3

cef.gyp

+7-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
'revision': '<!(python tools/revision.py)',
1111
# Need to be creative to match dylib version formatting requirements.
1212
'version_mac_dylib':
13-
'<!(python ../chrome/tools/build/version.py -f ../chrome/VERSION -t "3<(revision).@BUILD_HI@.@BUILD_LO@" -e "BUILD_HI=int(BUILD)/256" -e "BUILD_LO=int(BUILD)%256")',
13+
'<!(python ../chrome/tools/build/version.py -f VERSION -f ../chrome/VERSION -t "@CEF_MAJOR@<(revision).@BUILD_HI@.@BUILD_LO@" -e "BUILD_HI=int(BUILD)/256" -e "BUILD_LO=int(BUILD)%256")',
1414
},
1515
'includes': [
1616
# Bring in the source file lists.
@@ -792,6 +792,8 @@
792792
'libcef/browser/browser_settings.h',
793793
'libcef/browser/browser_urlrequest_impl.cc',
794794
'libcef/browser/browser_urlrequest_impl.h',
795+
'libcef/browser/chrome_scheme_handler.cc',
796+
'libcef/browser/chrome_scheme_handler.h',
795797
'libcef/browser/content_browser_client.cc',
796798
'libcef/browser/content_browser_client.h',
797799
'libcef/browser/context.cc',
@@ -810,6 +812,8 @@
810812
'libcef/browser/download_manager_delegate.h',
811813
'libcef/browser/frame_host_impl.cc',
812814
'libcef/browser/frame_host_impl.h',
815+
'libcef/browser/internal_scheme_handler.cc',
816+
'libcef/browser/internal_scheme_handler.h',
813817
'libcef/browser/javascript_dialog.h',
814818
'libcef/browser/javascript_dialog_creator.cc',
815819
'libcef/browser/javascript_dialog_creator.h',
@@ -830,6 +834,8 @@
830834
'libcef/browser/resource_request_job.cc',
831835
'libcef/browser/resource_request_job.h',
832836
'libcef/browser/scheme_impl.cc',
837+
'libcef/browser/scheme_registration.cc',
838+
'libcef/browser/scheme_registration.h',
833839
'libcef/browser/sqlite_diagnostics_stub.cc',
834840
'libcef/browser/stream_impl.cc',
835841
'libcef/browser/stream_impl.h',

libcef/browser/browser_host_impl.cc

+5
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include "libcef/browser/context.h"
1313
#include "libcef/browser/devtools_delegate.h"
1414
#include "libcef/browser/navigate_params.h"
15+
#include "libcef/browser/scheme_registration.h"
1516
#include "libcef/browser/thread_util.h"
1617
#include "libcef/browser/url_request_context_getter.h"
1718
#include "libcef/browser/url_request_context_getter_proxy.h"
@@ -1223,6 +1224,10 @@ void CefBrowserHostImpl::DidFinishLoad(
12231224
CefRefPtr<CefFrame> frame = GetOrCreateFrame(frame_id,
12241225
CefFrameHostImpl::kUnspecifiedFrameId, is_main_frame, string16(),
12251226
validated_url);
1227+
1228+
// Give internal scheme handlers an opportunity to update content.
1229+
scheme::DidFinishLoad(frame, validated_url);
1230+
12261231
OnLoadEnd(frame, validated_url);
12271232
}
12281233

0 commit comments

Comments
 (0)