| Index: chrome/renderer/extensions/extension_process_bindings.cc
|
| ===================================================================
|
| --- chrome/renderer/extensions/extension_process_bindings.cc (revision 18701)
|
| +++ chrome/renderer/extensions/extension_process_bindings.cc (working copy)
|
| @@ -14,12 +14,8 @@
|
| #include "chrome/renderer/js_only_v8_extensions.h"
|
| #include "chrome/renderer/render_view.h"
|
| #include "grit/renderer_resources.h"
|
| -#include "webkit/api/public/WebScriptSource.h"
|
| #include "webkit/glue/webframe.h"
|
|
|
| -using WebKit::WebScriptSource;
|
| -using WebKit::WebString;
|
| -
|
| namespace {
|
|
|
| const char kExtensionName[] = "chrome/ExtensionProcessBindings";
|
| @@ -105,7 +101,9 @@
|
| RenderView* renderview = GetRenderViewForCurrentContext();
|
| DCHECK(renderview);
|
| GURL url = renderview->webview()->GetMainFrame()->GetURL();
|
| - DCHECK(url.scheme() == chrome::kExtensionScheme);
|
| + // Don't check the URL scheme in unit tests.
|
| + if (RenderThread::current())
|
| + DCHECK(url.scheme() == chrome::kExtensionScheme);
|
|
|
| v8::Persistent<v8::Context> current_context =
|
| v8::Persistent<v8::Context>::New(v8::Context::GetCurrent());
|
| @@ -218,11 +216,6 @@
|
| ExtensionImpl::SetFunctionNames(names);
|
| }
|
|
|
| -void ExtensionProcessBindings::RegisterExtensionContext(WebFrame* frame) {
|
| - frame->ExecuteScript(WebScriptSource(WebString::fromUTF8(
|
| - "chrome.self.register_();")));
|
| -}
|
| -
|
| void ExtensionProcessBindings::HandleResponse(int request_id, bool success,
|
| const std::string& response,
|
| const std::string& error) {
|
|
|
| Property changes on: chrome\renderer\extensions\extension_process_bindings.cc
|
| ___________________________________________________________________
|
| Added: svn:eol-style
|
| + LF
|
|
|
|
|