Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade mixed content connection #4537

Merged
merged 1 commit into from
Feb 14, 2020
Merged

Upgrade mixed content connection #4537

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions app/brave_main_delegate.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,12 @@
#include "components/feed/feed_feature_list.h"
#include "components/omnibox/common/omnibox_features.h"
#include "components/password_manager/core/common/password_manager_features.h"
#include "components/security_state/core/features.h"
#include "components/sync/driver/sync_driver_switches.h"
#include "content/public/common/content_features.h"
#include "content/public/common/content_switches.h"
#include "services/network/public/cpp/features.h"
#include "third_party/blink/public/common/features.h"
jonathanKingston marked this conversation as resolved.
Show resolved Hide resolved
#include "third_party/widevine/cdm/buildflags.h"
#include "ui/base/ui_base_features.h"

Expand Down Expand Up @@ -151,7 +153,13 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) {

// Enabled features.
const std::unordered_set<const char*> enabled_features = {
// Upgrade all mixed content
blink::features::kMixedContentAutoupgrade.name,
password_manager::features::kPasswordImport.name,
// Remove URL bar mixed control and allow site specific override instead
features::kMixedContentSiteSetting.name,
// Warn about Mixed Content optionally blockable content
security_state::features::kPassiveMixedContentWarning.name,
// Enable webui dark theme: @media (prefers-color-scheme: dark) is gated on
// this feature.
features::kWebUIDarkMode.name,
Expand Down