diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-25 21:44:36 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-25 21:44:36 +0000 |
| commit | 4d166378f46ed1f4a00923250c60674527ac7d77 (patch) | |
| tree | b1ac480aacfafce8c105888b9b7d108fc0028d55 /extensions/shell | |
| parent | dfc0424c076efcddbcf312af589dc61c6bea1466 (diff) | |
| download | chromium_src-4d166378f46ed1f4a00923250c60674527ac7d77.zip chromium_src-4d166378f46ed1f4a00923250c60674527ac7d77.tar.gz chromium_src-4d166378f46ed1f4a00923250c60674527ac7d77.tar.bz2 | |
Extensions: Move bluetooth APIs to extensions/.
BUG=395240
Review URL: https://codereview.chromium.org/395333003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285687 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions/shell')
| -rw-r--r-- | extensions/shell/app_shell.gyp | 1 | ||||
| -rw-r--r-- | extensions/shell/browser/shell_extensions_browser_client.cc | 4 | ||||
| -rw-r--r-- | extensions/shell/browser/shell_extensions_browser_client.h | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/extensions/shell/app_shell.gyp b/extensions/shell/app_shell.gyp index cb1dceb..f24978b 100644 --- a/extensions/shell/app_shell.gyp +++ b/extensions/shell/app_shell.gyp @@ -80,6 +80,7 @@ '<(DEPTH)/content/content.gyp:content_gpu', '<(DEPTH)/content/content.gyp:content_ppapi_plugin', '<(DEPTH)/content/content_shell_and_tests.gyp:content_shell_lib', + '<(DEPTH)/device/hid/hid.gyp:device_hid', '<(DEPTH)/extensions/common/api/api.gyp:extensions_api', '<(DEPTH)/extensions/extensions.gyp:extensions_browser', '<(DEPTH)/extensions/extensions.gyp:extensions_common', diff --git a/extensions/shell/browser/shell_extensions_browser_client.cc b/extensions/shell/browser/shell_extensions_browser_client.cc index c725ebd..298d412 100644 --- a/extensions/shell/browser/shell_extensions_browser_client.cc +++ b/extensions/shell/browser/shell_extensions_browser_client.cc @@ -239,4 +239,8 @@ ShellExtensionsBrowserClient::GetComponentExtensionResourceManager() { return NULL; } +net::NetLog* ShellExtensionsBrowserClient::GetNetLog() { + return NULL; +} + } // namespace extensions diff --git a/extensions/shell/browser/shell_extensions_browser_client.h b/extensions/shell/browser/shell_extensions_browser_client.h index 648c7aa..472b5f0 100644 --- a/extensions/shell/browser/shell_extensions_browser_client.h +++ b/extensions/shell/browser/shell_extensions_browser_client.h @@ -74,6 +74,7 @@ class ShellExtensionsBrowserClient : public ExtensionsBrowserClient { content::BrowserContext* context) const OVERRIDE; virtual ComponentExtensionResourceManager* GetComponentExtensionResourceManager() OVERRIDE; + virtual net::NetLog* GetNetLog() OVERRIDE; private: // The single BrowserContext for app_shell. Not owned. |