Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2375)

Unified Diff: content/renderer/render_view_impl.cc

Issue 9694021: Merge http://src.chromium.org/viewvc/chrome?view=rev&revision=125923 by (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1025/src/
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/tab_contents/tab_contents_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
===================================================================
--- content/renderer/render_view_impl.cc (revision 126243)
+++ content/renderer/render_view_impl.cc (working copy)
@@ -3941,8 +3941,10 @@
void RenderViewImpl::OnSetWebUIProperty(const std::string& name,
const std::string& value) {
- DCHECK(enabled_bindings_ & content::BINDINGS_POLICY_WEB_UI);
- GetWebUIBindings()->SetProperty(name, value);
+ if (enabled_bindings_ & content::BINDINGS_POLICY_WEB_UI)
+ GetWebUIBindings()->SetProperty(name, value);
+ else
+ NOTREACHED() << "WebUI bindings not enabled.";
}
void RenderViewImpl::OnDragTargetDragEnter(const WebDropData& drop_data,
« no previous file with comments | « content/browser/tab_contents/tab_contents_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698