Skip to content

Commit

Permalink
Enable Kaleidoscope Chrome code
Browse files Browse the repository at this point in the history
As discussed, since this is a server side driven
feature we can switch this on by default and use
the server side allowlist.

BUG=1044741

Change-Id: I74a0352062c718027bef90aad42f202934a96289
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2261632
Commit-Queue: Becca Hughes <beccahughes@chromium.org>
Reviewed-by: Tommy Steimel <steimel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#782582}
  • Loading branch information
beccahughes authored and Commit Bot committed Jun 25, 2020
1 parent 7992cd3 commit 96bc544
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions chrome/browser/media/kaleidoscope/kaleidoscope_tab_helper.cc
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ void KaleidoscopeTabHelper::ReadyToCommitNavigation(
return;
}

if (handle->GetInitiatorOrigin().has_value() &&
handle->GetInitiatorOrigin() != KaleidoscopeOrigin()) {
if (!handle->GetInitiatorOrigin() ||
!handle->GetInitiatorOrigin()->IsSameOriginWith(KaleidoscopeOrigin())) {
return;
}

Expand Down
2 changes: 1 addition & 1 deletion media/base/media_switches.cc
Original file line number Diff line number Diff line change
Expand Up @@ -726,7 +726,7 @@ const base::Feature kInternalMediaSession {
};

const base::Feature kKaleidoscope{"Kaleidoscope",
base::FEATURE_DISABLED_BY_DEFAULT};
base::FEATURE_ENABLED_BY_DEFAULT};

const base::Feature kUseFakeDeviceForMediaStream{
"use-fake-device-for-media-stream", base::FEATURE_DISABLED_BY_DEFAULT};
Expand Down

0 comments on commit 96bc544

Please sign in to comment.