Pass target URL to OnBeforePopup (issue #596).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@633 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2012-05-18 21:37:42 +00:00
parent 8b1748bbf5
commit 0b003c55a9
2 changed files with 1 additions and 5 deletions

View File

@ -800,7 +800,6 @@ bool CefBrowserHostImpl::ShouldCreateWebContents(
// TODO(cef): Figure out how to populate these values.
// See: http://crbug.com/110510
CefPopupFeatures features;
pending_url_ = CefString();
pending_window_info_ = CefWindowInfo();
#if defined(OS_WIN)
@ -825,7 +824,7 @@ bool CefBrowserHostImpl::ShouldCreateWebContents(
// or cancel the window creation.
if (handler.get() &&
handler->OnBeforePopup(this, features, pending_window_info_,
pending_url_, pending_client_,
target_url.spec(), pending_client_,
pending_settings_)) {
pending_client_ = NULL;
return false;
@ -847,8 +846,6 @@ void CefBrowserHostImpl::WebContentsCreated(
CefRefPtr<CefBrowserHostImpl> browser = CefBrowserHostImpl::Create(
pending_window_info_, pending_settings_, pending_client_, new_contents,
opener);
if (browser.get() && !pending_url_.empty())
browser->LoadURL(CefFrameHostImpl::kMainFrameId, pending_url_);
pending_client_ = NULL;
}

View File

@ -327,7 +327,6 @@ class CefBrowserHostImpl : public CefBrowserHost,
CefWindowInfo pending_window_info_;
CefBrowserSettings pending_settings_;
CefRefPtr<CefClient> pending_client_;
CefString pending_url_;
// Volatile state information. All access must be protected by the state lock.
base::Lock state_lock_;