summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chrome_content_browser_client.cc
diff options
context:
space:
mode:
authorjiayl@chromium.org <jiayl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-23 09:00:47 +0000
committerjiayl@chromium.org <jiayl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-23 09:00:47 +0000
commit94fb51044f14d5a2c97bbdebd9d8f4f6a1c05ff9 (patch)
tree780131636e430ae965b21f95caefe402e4de27ee /chrome/browser/chrome_content_browser_client.cc
parent9b51b54bc515ea456ad38e6ed263f0fcbe970860 (diff)
downloadchromium_src-94fb51044f14d5a2c97bbdebd9d8f4f6a1c05ff9.zip
chromium_src-94fb51044f14d5a2c97bbdebd9d8f4f6a1c05ff9.tar.gz
chromium_src-94fb51044f14d5a2c97bbdebd9d8f4f6a1c05ff9.tar.bz2
Connecting webrtc-internals WebUI frontend with the backend
BUG=168232 Review URL: https://chromiumcodereview.appspot.com/11876007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178272 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_content_browser_client.cc')
-rw-r--r--chrome/browser/chrome_content_browser_client.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 4e6c2cb..1b6b4d7 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -39,6 +39,7 @@
#include "chrome/browser/extensions/suggest_permission_util.h"
#include "chrome/browser/geolocation/chrome_access_token_store.h"
#include "chrome/browser/google/google_util.h"
+#include "chrome/browser/media/chrome_webrtc_internals.h"
#include "chrome/browser/media/media_internals.h"
#include "chrome/browser/nacl_host/nacl_process_host.h"
#include "chrome/browser/net/chrome_net_log.h"
@@ -1307,6 +1308,10 @@ content::MediaObserver* ChromeContentBrowserClient::GetMediaObserver() {
return MediaInternals::GetInstance();
}
+content::WebRTCInternals* ChromeContentBrowserClient::GetWebRTCInternals() {
+ return ChromeWebRTCInternals::GetInstance();
+}
+
void ChromeContentBrowserClient::RequestDesktopNotificationPermission(
const GURL& source_origin,
int callback_context,