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

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

Issue 12967015: Update whitelist for Screen Capture API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media/media_capture_devices_dispatcher.cc
diff --git a/chrome/browser/media/media_capture_devices_dispatcher.cc b/chrome/browser/media/media_capture_devices_dispatcher.cc
index 23e7f31d1d27590053638c41fbc05b4f1b42ac20..f2edf00a231fde1fbe56424400b3c6a080cae2ee 100644
--- a/chrome/browser/media/media_capture_devices_dispatcher.cc
+++ b/chrome/browser/media/media_capture_devices_dispatcher.cc
@@ -49,8 +49,16 @@ const content::MediaStreamDevice* FindDefaultDeviceWithId(
// TODO(sergeyu): Remove this whitelist as soon as possible.
bool IsOriginWhitelistedForScreenCapture(const GURL& origin) {
#if defined(OFFICIAL_BUILD)
- return origin.spec() == "https://staging.talkgadget.google.com/" ||
- origin.spec() == "https://plus.google.com/";
+ return
+ // Google Hangouts.
+ origin.spec() == "https://staging.talkgadget.google.com/" ||
+ origin.spec() == "https://plus.google.com/" ||
+ // CV.
+ origin.spec() == "chrome-extension://pkedcjkdefgpdelpbcmbmeomcjbeemfm/" ||
+ // CV Staging.
+ origin.spec() == "chrome-extension://fmfcbgogabcbclcofgocippekhfcmgfj/" ||
+ // CV Canary.
+ origin.spec() == "chrome-extension://hfaagokkkhdbgiakmmlclaapfelnkoah/";
#else
return false;
#endif
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698