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

44
libcef/browser_impl.cc
View File

@ -680,30 +680,6 @@ WebFrame* CefBrowserImpl::UIT_GetWebFrame(CefRefPtr<CefFrame> frame)
void CefBrowserImpl::UIT_DestroyBrowser()
{
#if defined(OS_WIN)
if (is_modal_) {
// Exit our own internal modal message loop now.
if (internal_modal_message_loop_is_active_) {
MessageLoop* message_loop = MessageLoop::current();
message_loop->QuitNow();
}
// If the client implemented its own modal loop then the above would not
// run, so this call is for the client to exit its loop. Otherwise,
// QuitModal can be used to let clients know that the modal loop is about
// to exit.
if (client_.get()) {
CefRefPtr<CefLifeSpanHandler> handler = client_->GetLifeSpanHandler();
if (handler.get()) {
// Notify the handler that it can exit its modal loop if it was in one.
handler->QuitModal(this);
}
}
}
UIT_GetWebViewDelegate()->RevokeDragDrop();
#else
// Call OnBeforeClose() here for platforms that don't support modal dialogs.
if (client_.get()) {
CefRefPtr<CefLifeSpanHandler> handler = client_->GetLifeSpanHandler();
if (handler.get()) {
@ -711,6 +687,17 @@ void CefBrowserImpl::UIT_DestroyBrowser()
handler->OnBeforeClose(this);
}
}
#if defined(OS_WIN)
if (is_modal_) {
// Exit our own internal modal message loop now.
if (internal_modal_message_loop_is_active_) {
MessageLoop* message_loop = MessageLoop::current();
message_loop->QuitNow();
}
}
UIT_GetWebViewDelegate()->RevokeDragDrop();
#endif
// If the current browser window is a dev tools client then disconnect from
@ -747,15 +734,6 @@ void CefBrowserImpl::UIT_CloseBrowser()
{
REQUIRE_UIT();
if (IsWindowRenderingDisabled()) {
// There is no window here so we need to notify the client that this
// browser instance is about to go away.
if (client_.get()) {
CefRefPtr<CefLifeSpanHandler> handler = client_->GetLifeSpanHandler();
if (handler.get()) {
// Notify the handler that the window is about to be closed.
handler->OnBeforeClose(this);
}
}
UIT_DestroyBrowser();
} else {
UIT_CloseView(UIT_GetMainWndHandle());