diff options
| author | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-27 04:20:42 +0000 |
|---|---|---|
| committer | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-27 04:20:42 +0000 |
| commit | f845448465edd4d1416bf787e6a8be566f95e870 (patch) | |
| tree | 565d2038ccfb0709305c8e350d0203bada32c841 /chrome/browser/extensions/api/webrtc_audio_private | |
| parent | de101e124a81814fb7a0e183b6a3761f334b926a (diff) | |
| download | chromium_src-f845448465edd4d1416bf787e6a8be566f95e870.zip chromium_src-f845448465edd4d1416bf787e6a8be566f95e870.tar.gz chromium_src-f845448465edd4d1416bf787e6a8be566f95e870.tar.bz2 | |
Reland 253509 - ProfileKeyedAPIFactory to build instances with BrowserContext instead of Profile.
The build broke the first time because of a merge conflict.
This also updates a few call sites that were missed earlier, and it includes profile.h where it was previously gotten transitively.
BUG=309909
TBR=sky@chromium.org
Review URL: https://codereview.chromium.org/181913003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253712 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/api/webrtc_audio_private')
| -rw-r--r-- | chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.h | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc index 2d7175e..7bf7676 100644 --- a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc +++ b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc @@ -10,7 +10,9 @@ #include "chrome/browser/extensions/api/tabs/tabs_constants.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_tab_util.h" +#include "chrome/browser/profiles/profile.h" #include "content/public/browser/media_device_id.h" +#include "content/public/browser/resource_context.h" #include "content/public/browser/web_contents.h" #include "extensions/browser/event_router.h" #include "extensions/browser/extension_system.h" diff --git a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.h b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.h index 840888c..066ab39 100644 --- a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.h +++ b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.h @@ -14,6 +14,10 @@ #include "media/audio/audio_device_name.h" #include "url/gurl.h" +namespace content { +class ResourceContext; +} + namespace extensions { // Listens for device changes and forwards as an extension event. |