diff options
| author | meacer@chromium.org <meacer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-03 08:02:35 +0000 |
|---|---|---|
| committer | meacer@chromium.org <meacer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-03 08:02:35 +0000 |
| commit | 8cc3d1cce54c6f3909985761d4e8ce6cb85bd2b8 (patch) | |
| tree | cf04f3242bacb9f7f92d5aa9bd6c6068ba2a1447 /apps | |
| parent | 3ce3bf289232be6e15991e6458d25087a4583236 (diff) | |
| download | chromium_src-8cc3d1cce54c6f3909985761d4e8ce6cb85bd2b8.zip chromium_src-8cc3d1cce54c6f3909985761d4e8ce6cb85bd2b8.tar.gz chromium_src-8cc3d1cce54c6f3909985761d4e8ce6cb85bd2b8.tar.bz2 | |
Relanding user gesture fix for external protocol handlers after revert.
The original CL that broke the build: https://codereview.chromium.org/131783012/
BUG=173557
TBR=pkasting@chromium.org,joi@chromium.org,kalman@chromium.org,jochen@chromium.org,mmenke@chromium.org,boliu@chromium.org
Review URL: https://codereview.chromium.org/214603010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261316 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/shell/browser/shell_extensions_browser_client.cc | 3 | ||||
| -rw-r--r-- | apps/shell/browser/shell_extensions_browser_client.h | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/apps/shell/browser/shell_extensions_browser_client.cc b/apps/shell/browser/shell_extensions_browser_client.cc index bfa44d7..9207f77 100644 --- a/apps/shell/browser/shell_extensions_browser_client.cc +++ b/apps/shell/browser/shell_extensions_browser_client.cc @@ -178,9 +178,6 @@ bool ShellExtensionsBrowserClient::DidVersionUpdate(BrowserContext* context) { return false; } -void ShellExtensionsBrowserClient::PermitExternalProtocolHandler() { -} - scoped_ptr<AppSorting> ShellExtensionsBrowserClient::CreateAppSorting() { return scoped_ptr<AppSorting>(new apps::ShellAppSorting); } diff --git a/apps/shell/browser/shell_extensions_browser_client.h b/apps/shell/browser/shell_extensions_browser_client.h index d7aed6b..c2a2130 100644 --- a/apps/shell/browser/shell_extensions_browser_client.h +++ b/apps/shell/browser/shell_extensions_browser_client.h @@ -54,7 +54,6 @@ class ShellExtensionsBrowserClient : 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( |