summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
Diffstat (limited to 'extensions')
-rw-r--r--extensions/browser/extension_function_dispatcher.cc2
-rw-r--r--extensions/browser/extensions_browser_client.h4
-rw-r--r--extensions/browser/test_extensions_browser_client.cc2
-rw-r--r--extensions/browser/test_extensions_browser_client.h1
4 files changed, 0 insertions, 9 deletions
diff --git a/extensions/browser/extension_function_dispatcher.cc b/extensions/browser/extension_function_dispatcher.cc
index 5e0cffe..d6420e3 100644
--- a/extensions/browser/extension_function_dispatcher.cc
+++ b/extensions/browser/extension_function_dispatcher.cc
@@ -375,8 +375,6 @@ void ExtensionFunctionDispatcher::DispatchWithCallbackInternal(
if (violation_error.empty()) {
scoped_ptr<base::ListValue> args(params.arguments.DeepCopy());
- // See crbug.com/39178.
- ExtensionsBrowserClient::Get()->PermitExternalProtocolHandler();
NotifyApiFunctionCalled(
extension->id(), params.name, args.Pass(), browser_context_);
function->Run();
diff --git a/extensions/browser/extensions_browser_client.h b/extensions/browser/extensions_browser_client.h
index f9e63e5..c7542a7 100644
--- a/extensions/browser/extensions_browser_client.h
+++ b/extensions/browser/extensions_browser_client.h
@@ -115,10 +115,6 @@ class ExtensionsBrowserClient {
// version for later comparison.
virtual bool DidVersionUpdate(content::BrowserContext* context) = 0;
- // Permits an external protocol handler to be launched. See
- // ExternalProtocolHandler::PermitLaunchUrl() in Chrome.
- virtual void PermitExternalProtocolHandler() = 0;
-
// Creates a new AppSorting instance.
virtual scoped_ptr<AppSorting> CreateAppSorting() = 0;
diff --git a/extensions/browser/test_extensions_browser_client.cc b/extensions/browser/test_extensions_browser_client.cc
index 14816cc..f1d3cc9 100644
--- a/extensions/browser/test_extensions_browser_client.cc
+++ b/extensions/browser/test_extensions_browser_client.cc
@@ -111,8 +111,6 @@ bool TestExtensionsBrowserClient::DidVersionUpdate(BrowserContext* context) {
return false;
}
-void TestExtensionsBrowserClient::PermitExternalProtocolHandler() {}
-
scoped_ptr<AppSorting> TestExtensionsBrowserClient::CreateAppSorting() {
return scoped_ptr<AppSorting>();
}
diff --git a/extensions/browser/test_extensions_browser_client.h b/extensions/browser/test_extensions_browser_client.h
index c0e83c3..4db3270 100644
--- a/extensions/browser/test_extensions_browser_client.h
+++ b/extensions/browser/test_extensions_browser_client.h
@@ -54,7 +54,6 @@ class TestExtensionsBrowserClient : public ExtensionsBrowserClient {
virtual scoped_ptr<ExtensionHostDelegate> CreateExtensionHostDelegate()
OVERRIDE;
virtual bool DidVersionUpdate(content::BrowserContext* context) OVERRIDE;
- virtual void PermitExternalProtocolHandler() OVERRIDE;
virtual scoped_ptr<AppSorting> CreateAppSorting() OVERRIDE;
virtual bool IsRunningInForcedAppMode() OVERRIDE;
virtual ApiActivityMonitor* GetApiActivityMonitor(