mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-02-04 04:58:14 +01:00
dbe8de277f
- Replace CefHandler with a new CefClient interface and separate handler interfaces. - Add support for virtual inheritance to allow multiple CefBase parented interfaces to be implemented in the same class. - Replace CefThreadSafeBase with IMPLEMENT_* macros to support virtual inheritance and to only provide locking implementations when needed. - Move the CefBrowserSettings parameter from CefInitialize to CreateBrowser. - Add a new cef_build.h header that provides platform-specific and OS_* defines. - Introduce the use of OVERRIDE to generate compiler errors on Windows if a child virtual method declaration doesn't match the parent declaration. - Use NDEBUG instead of _DEBUG because _DEBUG is not defined on Mac. (issue #240). git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@235 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
72 lines
2.2 KiB
C++
72 lines
2.2 KiB
C++
// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights
|
|
// reserved. Use of this source code is governed by a BSD-style license that
|
|
// can be found in the LICENSE file.
|
|
//
|
|
// ---------------------------------------------------------------------------
|
|
//
|
|
// A portion of this file was generated by the CEF translator tool. When
|
|
// making changes by hand only do so within the body of existing static and
|
|
// virtual method implementations. See the translator.README.txt file in the
|
|
// tools directory for more information.
|
|
//
|
|
|
|
#include "libcef_dll/cpptoc/browser_cpptoc.h"
|
|
#include "libcef_dll/ctocpp/client_ctocpp.h"
|
|
#include "libcef_dll/ctocpp/life_span_handler_ctocpp.h"
|
|
|
|
|
|
// VIRTUAL METHODS - Body may be edited by hand.
|
|
|
|
bool CefLifeSpanHandlerCToCpp::OnBeforePopup(
|
|
CefRefPtr<CefBrowser> parentBrowser, const CefPopupFeatures& popupFeatures,
|
|
CefWindowInfo& windowInfo, const CefString& url,
|
|
CefRefPtr<CefClient>& client, CefBrowserSettings& settings)
|
|
{
|
|
if (CEF_MEMBER_MISSING(struct_, on_before_popup))
|
|
return false;
|
|
|
|
cef_browser_t* browserStruct = CefBrowserCppToC::Wrap(parentBrowser);
|
|
cef_client_t* clientStruct = NULL;
|
|
if(client.get())
|
|
clientStruct = CefClientCToCpp::Unwrap(client);
|
|
cef_client_t* origClientStruct = clientStruct;
|
|
|
|
int rv = struct_->on_before_popup(struct_,
|
|
browserStruct, &popupFeatures, &windowInfo, url.GetStruct(),
|
|
&clientStruct, &settings);
|
|
|
|
if (clientStruct) {
|
|
if (clientStruct != origClientStruct) {
|
|
// The handler was changed.
|
|
client = CefClientCToCpp::Wrap(clientStruct);
|
|
}
|
|
} else {
|
|
client = NULL;
|
|
}
|
|
|
|
return (rv ? true : false);
|
|
}
|
|
|
|
void CefLifeSpanHandlerCToCpp::OnAfterCreated(CefRefPtr<CefBrowser> browser)
|
|
{
|
|
if (CEF_MEMBER_MISSING(struct_, on_after_created))
|
|
return;
|
|
|
|
return struct_->on_after_created(struct_, CefBrowserCppToC::Wrap(browser));
|
|
}
|
|
|
|
void CefLifeSpanHandlerCToCpp::OnBeforeClose(CefRefPtr<CefBrowser> browser)
|
|
{
|
|
if (CEF_MEMBER_MISSING(struct_, on_before_close))
|
|
return;
|
|
|
|
return struct_->on_before_close(struct_, CefBrowserCppToC::Wrap(browser));
|
|
}
|
|
|
|
|
|
#ifndef NDEBUG
|
|
template<> long CefCToCpp<CefLifeSpanHandlerCToCpp, CefLifeSpanHandler,
|
|
cef_life_span_handler_t>::DebugObjCt = 0;
|
|
#endif
|
|
|