Replacing WebUIBindings use of CPPBoundClass with v8::Extension.

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 3c9e7856b210e443f9fd709b74dfd9be106912d0..6e13db4659a2016fce2863ea5709391dfa3c4281 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -97,7 +97,6 @@
 #include "content/renderer/text_input_client_observer.h"
 #include "content/renderer/v8_value_converter_impl.h"
 #include "content/renderer/web_intents_host.h"
-#include "content/renderer/web_ui_bindings.h"
 #include "content/renderer/webplugin_delegate_proxy.h"
 #include "content/renderer/websharedworker_proxy.h"
 #include "media/base/filter_collection.h"
@@ -3217,13 +3216,6 @@ void RenderViewImpl::didClearWindowObject(WebFrame* frame) {
   FOR_EACH_OBSERVER(RenderViewObserver, observers_,
                     DidClearWindowObject(frame));
 
-  GURL frame_url = frame->document().url();
-  if ((enabled_bindings_ & content::BINDINGS_POLICY_WEB_UI) &&
-      (frame_url.SchemeIs(chrome::kChromeUIScheme) ||
-      frame_url.SchemeIs(chrome::kDataScheme))) {
-    GetWebUIBindings()->BindToJavascript(frame, "chrome");
-  }
-
   if (enabled_bindings_ & content::BINDINGS_POLICY_DOM_AUTOMATION) {
     if (!dom_automation_controller_.get())
       dom_automation_controller_.reset(new DomAutomationController());
@@ -4330,14 +4322,6 @@ GURL RenderViewImpl::GetLoadingUrl(WebKit::WebFrame* frame) const {
   return request.url();
 }
 
-WebUIBindings* RenderViewImpl::GetWebUIBindings() {
-  if (!web_ui_bindings_.get()) {
-    web_ui_bindings_.reset(new WebUIBindings(
-        static_cast<content::RenderView*>(this), routing_id_));
-  }
-  return web_ui_bindings_.get();
-}
-
 WebKit::WebPlugin* RenderViewImpl::GetWebPluginFromPluginDocument() {
   return webview()->mainFrame()->document().to<WebPluginDocument>().plugin();
 }
@@ -4663,10 +4647,16 @@ void RenderViewImpl::OnAllowBindings(int enabled_bindings_flags) {
 
 void RenderViewImpl::OnSetWebUIProperty(const std::string& name,
                                         const std::string& value) {
-  if (enabled_bindings_ & content::BINDINGS_POLICY_WEB_UI)
-    GetWebUIBindings()->SetProperty(name, value);
-  else
+  if (enabled_bindings_ & content::BINDINGS_POLICY_WEB_UI) {

[abarth-chromium, 2012/08/23 20:13:24]

What happened to the check for chrome::kChromeUIScheme and
chrome::kChromeUIScheme ?  Is that done elsewhere?

Also, previously this was done on a per-frame basis.  This appears to be a
per-view basis.  Is that a problem?

[Shishir, 2012/11/06 20:08:38]

Checks are now in the extension during the chrome.send call.
Fixed this. Now the data is available in all the frames.

+    if (webview() && webview()->mainFrame()) {
+      std::string script = "chrome." + name + " = \"" + value + "\";";
+      webview()->mainFrame()->executeScript(
+          WebKit::WebScriptSource(WebKit::WebString::fromUTF8(script.c_str())));
+    }
+  } else {
     NOTREACHED() << "WebUI bindings not enabled.";
+  }
+
 }
 
 void RenderViewImpl::OnDragTargetDragEnter(const WebDropData& drop_data,