summaryrefslogtreecommitdiffstats
path: root/chrome/browser/profiles
diff options
context:
space:
mode:
authorjustinlin@chromium.org <justinlin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-26 00:58:16 +0000
committerjustinlin@chromium.org <justinlin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-26 00:58:16 +0000
commit0b9383a481c1620a5a8582a8dfc1e94d345e9d22 (patch)
tree894654ac72592eb46a19c96d34208b14410af05b /chrome/browser/profiles
parent0d7f382f6c958e1fa59f7a18cd70044c2f2226b4 (diff)
downloadchromium_src-0b9383a481c1620a5a8582a8dfc1e94d345e9d22.zip
chromium_src-0b9383a481c1620a5a8582a8dfc1e94d345e9d22.tar.gz
chromium_src-0b9383a481c1620a5a8582a8dfc1e94d345e9d22.tar.bz2
Implement chrome extension tab capture API as specified here:
http://dev.chromium.org/developers/design-documents/extensions/proposed-changes/apis-under-development/webrtc-tab-content-capture Also, make tab capture media stream requests verify that the request came from extension API. BUG=153388 Review URL: https://chromiumcodereview.appspot.com/11273033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164230 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profiles')
-rw-r--r--chrome/browser/profiles/profile_dependency_manager.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/profiles/profile_dependency_manager.cc b/chrome/browser/profiles/profile_dependency_manager.cc
index f2eacd2..f5d3213 100644
--- a/chrome/browser/profiles/profile_dependency_manager.cc
+++ b/chrome/browser/profiles/profile_dependency_manager.cc
@@ -17,6 +17,7 @@
#include "chrome/browser/extensions/api/commands/command_service_factory.h"
#include "chrome/browser/extensions/api/discovery/suggested_links_registry_factory.h"
#include "chrome/browser/extensions/app_restore_service_factory.h"
+#include "chrome/browser/extensions/api/tab_capture/tab_capture_registry_factory.h"
#include "chrome/browser/extensions/extension_system_factory.h"
#include "chrome/browser/favicon/favicon_service_factory.h"
#include "chrome/browser/google/google_url_tracker_factory.h"
@@ -222,6 +223,7 @@ void ProfileDependencyManager::AssertFactoriesBuilt() {
extensions::CommandServiceFactory::GetInstance();
extensions::SuggestedLinksRegistryFactory::GetInstance();
extensions::ExtensionSystemFactory::GetInstance();
+ extensions::TabCaptureRegistryFactory::GetInstance();
#endif
FaviconServiceFactory::GetInstance();
FindBarStateFactory::GetInstance();