diff options
| author | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-06 22:51:04 +0000 |
|---|---|---|
| committer | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-06 22:51:04 +0000 |
| commit | 11e7e3bd16e35256d1d0a6fd80968aab1b4025f2 (patch) | |
| tree | 603b6ac2c47bf1a078785590e44fe10660dfa61a /chrome/renderer | |
| parent | ef17eadd053b655afd2453ad08b3a817a69de3a4 (diff) | |
| download | chromium_src-11e7e3bd16e35256d1d0a6fd80968aab1b4025f2.zip chromium_src-11e7e3bd16e35256d1d0a6fd80968aab1b4025f2.tar.gz chromium_src-11e7e3bd16e35256d1d0a6fd80968aab1b4025f2.tar.bz2 | |
Revert 46592 - 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
TBR=ericdingle@google.com
Review URL: http://codereview.chromium.org/2036002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46638 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, 2 insertions, 3 deletions
diff --git a/chrome/renderer/extensions/extension_process_bindings.cc b/chrome/renderer/extensions/extension_process_bindings.cc index b9f4e29..0e28a91 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(1 == popup_matcher.views()->Length()); + DCHECK(popup_matcher.views()->Has(0)); // 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 0cfcc1f..339ae18 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -2758,8 +2758,7 @@ void RenderView::OnUserScriptIdleTriggered(WebFrame* frame) { } void RenderView::didHandleOnloadEvents(WebFrame* frame) { - if (webview()->mainFrame() == frame) - Send(new ViewHostMsg_DocumentOnLoadCompletedInMainFrame(routing_id_)); + // Ignore } void RenderView::didFailLoad(WebFrame* frame, const WebURLError& error) { |