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

Unified Diff: chrome/browser/media/media_stream_infobar_delegate_android.cc

Issue 2123863004: ScreenCapture for Android phase1, part II (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: UI tweaking and rebase Created 4 years, 4 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: chrome/browser/media/media_stream_infobar_delegate_android.cc
diff --git a/chrome/browser/media/media_stream_infobar_delegate_android.cc b/chrome/browser/media/media_stream_infobar_delegate_android.cc
index 2bfc3a0671589675ffa7ebc652f38a7ccaf25811..5a806fb93d257b1fec10a080201cfb922bbbcb57 100644
--- a/chrome/browser/media/media_stream_infobar_delegate_android.cc
+++ b/chrome/browser/media/media_stream_infobar_delegate_android.cc
@@ -38,6 +38,8 @@ std::vector<ContentSettingsType> GetContentSettingsTypes(
types.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
if (controller->IsAskingForVideo())
types.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
+ if (controller->IsAskingForScreenCapture())
+ types.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_SCREEN);
return types;
}
@@ -85,7 +87,8 @@ MediaStreamInfoBarDelegateAndroid::MediaStreamInfoBarDelegateAndroid(
GetContentSettingsTypes(controller.get())),
controller_(std::move(controller)) {
DCHECK(controller_.get());
- DCHECK(controller_->IsAskingForAudio() || controller_->IsAskingForVideo());
+ DCHECK(controller_->IsAskingForAudio() || controller_->IsAskingForVideo() ||
+ controller_->IsAskingForScreenCapture());
}
void MediaStreamInfoBarDelegateAndroid::InfoBarDismissed() {

Powered by Google App Engine
This is Rietveld 408576698