bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Clean up implementation of modal window callbacks (issue #281).

Browse Source 
- Fix CefBrowser::GoForward documentation typo (issue #291).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@271 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2011-08-03 15:35:51 +00:00
parent 0f414c8ac8
commit 512b864639
20 changed files with 187 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libcef_dll/ctocpp/browser_ctocpp.cc
View File

@@ -40,6 +40,14 @@ CefRefPtr<CefBrowser> CefBrowser::CreateBrowserSync(CefWindowInfo& windowInfo,
// VIRTUAL METHODS - Body may be edited by hand.
void CefBrowserCToCpp::ParentWindowWillClose()
{
if (CEF_MEMBER_MISSING(struct_, parent_window_will_close))
return;
struct_->parent_window_will_close(struct_);
}
void CefBrowserCToCpp::CloseBrowser()
{
if(CEF_MEMBER_MISSING(struct_, close_browser))

1
libcef_dll/ctocpp/browser_ctocpp.h
View File

@@ -31,6 +31,7 @@ public:
virtual ~CefBrowserCToCpp() {}
// CefBrowser methods
virtual void ParentWindowWillClose() OVERRIDE;
virtual void CloseBrowser() OVERRIDE;
virtual bool CanGoBack() OVERRIDE;
virtual void GoBack() OVERRIDE;

24
libcef_dll/ctocpp/life_span_handler_ctocpp.cc
View File

@@ -55,14 +55,6 @@ void CefLifeSpanHandlerCToCpp::OnAfterCreated(CefRefPtr<CefBrowser> browser)
struct_->on_after_created(struct_, CefBrowserCppToC::Wrap(browser));
}
void CefLifeSpanHandlerCToCpp::OnBeforeClose(CefRefPtr<CefBrowser> browser)
{
if (CEF_MEMBER_MISSING(struct_, on_before_close))
return;
struct_->on_before_close(struct_, CefBrowserCppToC::Wrap(browser));
}
bool CefLifeSpanHandlerCToCpp::RunModal(CefRefPtr<CefBrowser> browser)
{
if (CEF_MEMBER_MISSING(struct_, run_modal))
@@ -73,12 +65,22 @@ bool CefLifeSpanHandlerCToCpp::RunModal(CefRefPtr<CefBrowser> browser)
return (rv ? true : false);
}
void CefLifeSpanHandlerCToCpp::QuitModal(CefRefPtr<CefBrowser> browser)
bool CefLifeSpanHandlerCToCpp::DoClose(CefRefPtr<CefBrowser> browser)
{
if (CEF_MEMBER_MISSING(struct_, quit_modal))
if (CEF_MEMBER_MISSING(struct_, do_close))
return false;
int rv = struct_->do_close(struct_, CefBrowserCppToC::Wrap(browser));
return (rv ? true : false);
}
void CefLifeSpanHandlerCToCpp::OnBeforeClose(CefRefPtr<CefBrowser> browser)
{
if (CEF_MEMBER_MISSING(struct_, on_before_close))
return;
struct_->quit_modal(struct_, CefBrowserCppToC::Wrap(browser));
struct_->on_before_close(struct_, CefBrowserCppToC::Wrap(browser));
}

4
libcef_dll/ctocpp/life_span_handler_ctocpp.h
View File

@@ -38,9 +38,9 @@ public:
const CefString& url, CefRefPtr<CefClient>& client,
CefBrowserSettings& settings) OVERRIDE;
virtual void OnAfterCreated(CefRefPtr<CefBrowser> browser) OVERRIDE;
virtual void OnBeforeClose(CefRefPtr<CefBrowser> browser) OVERRIDE;
virtual bool RunModal(CefRefPtr<CefBrowser> browser) OVERRIDE;
virtual void QuitModal(CefRefPtr<CefBrowser> browser) OVERRIDE;
virtual bool DoClose(CefRefPtr<CefBrowser> browser) OVERRIDE;
virtual void OnBeforeClose(CefRefPtr<CefBrowser> browser) OVERRIDE;
};
#endif // BUILDING_CEF_SHARED