diff options
| author | ericdingle@google.com <ericdingle@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-12 18:51:26 +0000 |
|---|---|---|
| committer | ericdingle@google.com <ericdingle@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-12 18:51:26 +0000 |
| commit | dd3c3e68d29e797ca96323ee51b9b41438f7c9ba (patch) | |
| tree | 2a21132ebf8d8b0a71c409e239f003b669bfde76 /chrome/renderer | |
| parent | 12a7e779988f47663578c85d29a54feea91b377a (diff) | |
| download | chromium_src-dd3c3e68d29e797ca96323ee51b9b41438f7c9ba.zip chromium_src-dd3c3e68d29e797ca96323ee51b9b41438f7c9ba.tar.gz chromium_src-dd3c3e68d29e797ca96323ee51b9b41438f7c9ba.tar.bz2 | |
Disallow display of multiple experimental.extension.popup(...) windows
This is a duplicate of http://codereview.chromium.org/2027006 which was accidentally created in a read-only client.
BUG=None
TEST=ExtensionApiTest.Popup
Review URL: http://codereview.chromium.org/2003016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47052 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 0fb2593..6d2e6fc 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -2763,7 +2763,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) { |