Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1523)

Unified Diff: content/renderer/p2p/filtering_network_manager.cc

Issue 2157453002: Do FilteringNetworkManager::CheckPermission from new Initialize method. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2785
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/p2p/filtering_network_manager.cc
diff --git a/content/renderer/p2p/filtering_network_manager.cc b/content/renderer/p2p/filtering_network_manager.cc
index 667e199b95696b861d5869a4ee2e43fc75e64493..4112d56f51308971479ce54f9aabf500e66de97f 100644
--- a/content/renderer/p2p/filtering_network_manager.cc
+++ b/content/renderer/p2p/filtering_network_manager.cc
@@ -34,22 +34,6 @@ FilteringNetworkManager::FilteringNetworkManager(
}
}
-void FilteringNetworkManager::CheckPermission() {
- DCHECK(thread_checker_.CalledOnValidThread());
- DCHECK(!started_permission_check_);
-
- started_permission_check_ = true;
- pending_permission_checks_ = 2;
-
- // Request for media permission asynchronously.
- media_permission_->HasPermission(
- media::MediaPermission::AUDIO_CAPTURE, requesting_origin_,
- base::Bind(&FilteringNetworkManager::OnPermissionStatus, GetWeakPtr()));
- media_permission_->HasPermission(
- media::MediaPermission::VIDEO_CAPTURE, requesting_origin_,
- base::Bind(&FilteringNetworkManager::OnPermissionStatus, GetWeakPtr()));
-}
-
FilteringNetworkManager::~FilteringNetworkManager() {
DCHECK(thread_checker_.CalledOnValidThread());
// This helps to catch the case if permission never comes back.
@@ -61,6 +45,12 @@ base::WeakPtr<FilteringNetworkManager> FilteringNetworkManager::GetWeakPtr() {
return weak_ptr_factory_.GetWeakPtr();
}
+void FilteringNetworkManager::Initialize() {
+ rtc::NetworkManagerBase::Initialize();
+ if (media_permission_)
+ CheckPermission();
+}
+
void FilteringNetworkManager::StartUpdating() {
DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(started_permission_check_);
@@ -101,6 +91,22 @@ bool FilteringNetworkManager::GetDefaultLocalAddress(
return network_manager_->GetDefaultLocalAddress(family, ipaddress);
}
+void FilteringNetworkManager::CheckPermission() {
+ DCHECK(thread_checker_.CalledOnValidThread());
+ DCHECK(!started_permission_check_);
+
+ started_permission_check_ = true;
+ pending_permission_checks_ = 2;
+
+ // Request for media permission asynchronously.
+ media_permission_->HasPermission(
+ media::MediaPermission::AUDIO_CAPTURE, requesting_origin_,
+ base::Bind(&FilteringNetworkManager::OnPermissionStatus, GetWeakPtr()));
+ media_permission_->HasPermission(
+ media::MediaPermission::VIDEO_CAPTURE, requesting_origin_,
+ base::Bind(&FilteringNetworkManager::OnPermissionStatus, GetWeakPtr()));
+}
+
void FilteringNetworkManager::OnPermissionStatus(bool granted) {
DCHECK(thread_checker_.CalledOnValidThread());
DCHECK_GT(pending_permission_checks_, 0);
« no previous file with comments | « content/renderer/p2p/filtering_network_manager.h ('k') | content/renderer/p2p/filtering_network_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698