diff options
| author | ericdingle@google.com <ericdingle@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-06 18:35:29 +0000 |
|---|---|---|
| committer | ericdingle@google.com <ericdingle@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-06 18:35:29 +0000 |
| commit | 5cce3cd134a69809feab9086c0ff52cbd87bae0e (patch) | |
| tree | e76f43828db3db5ec583fc5f43429c712e068c73 /chrome/renderer | |
| parent | 656475d275524893e4e9b1f02469fe470721a14e (diff) | |
| download | chromium_src-5cce3cd134a69809feab9086c0ff52cbd87bae0e.zip chromium_src-5cce3cd134a69809feab9086c0ff52cbd87bae0e.tar.gz chromium_src-5cce3cd134a69809feab9086c0ff52cbd87bae0e.tar.bz2 | |
Disallow display of multiple experimental.extension.popup(...) windows.
Patch 1 contains twiz@'s code reviewed implementation from http://codereview.chromium.org/1512007.
This CL is to address the failure of release tests.
BUG=None
TEST=ExtensionApiTest.Popup
Review URL: http://codereview.chromium.org/1921003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46592 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/extensions/extension_process_bindings.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/render_view.cc | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/chrome/renderer/extensions/extension_process_bindings.cc b/chrome/renderer/extensions/extension_process_bindings.cc index 0e28a91..b9f4e29 100644 --- a/chrome/renderer/extensions/extension_process_bindings.cc +++ b/chrome/renderer/extensions/extension_process_bindings.cc @@ -299,7 +299,7 @@ class ExtensionImpl : public ExtensionBase { if (0 == popup_matcher.views()->Length()) return v8::Undefined(); - DCHECK(popup_matcher.views()->Has(0)); + DCHECK(1 == popup_matcher.views()->Length()); // Return the first view found. return popup_matcher.views()->Get(v8::Integer::New(0)); diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 45cef24..4823e2e 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -2727,7 +2727,8 @@ void RenderView::OnUserScriptIdleTriggered(WebFrame* frame) { } void RenderView::didHandleOnloadEvents(WebFrame* frame) { - // Ignore + if (webview()->mainFrame() == frame) + Send(new ViewHostMsg_DocumentOnLoadCompletedInMainFrame(routing_id_)); } void RenderView::didFailLoad(WebFrame* frame, const WebURLError& error) { |