Re-add support for Chromecast

Fixes brave/brave-browser#209
brave · Jul 23, 2019 · e0ed3de · e0ed3de
1 parent 9258a23
commit e0ed3de
Show file tree

Hide file tree

Showing 17 changed files with 340 additions and 3 deletions.
diff --git a/app/brave_generated_resources.grd b/app/brave_generated_resources.grd
@@ -403,6 +403,15 @@ By installing this extension, you are agreeing to the Google Widevine Terms of U
      <message name="IDS_SETTINGS_HANGOUTS_ENABLED_DESC" desc="The description for Hangouts switch in settings">
         Uses Hangouts component to enable screen sharing and other features in the browser.
       </message>
+     <message name="IDS_SETTINGS_MEDIA_ROUTER_ENABLED_DESC" desc="The description for Media Router switch in settings">
+        Uses Media Router component to enable Chromecast in the browser.
+      </message>
+     <message name="IDS_SETTINGS_RESTART_NOTICE" desc="Notifies the user that they need to relaunch Brave">
+        Your changes will take effect the next time you relaunch Brave.
+      </message>
+     <message name="IDS_SETTINGS_RELAUNCH_BUTTON_LABEL" desc="Notifies the user that they need to relaunch Brave">
+        Relaunch Now
+      </message>
      <message name="IDS_SETTINGS_IPFS_COMPANION_ENABLED_DESC" desc="The description for IPFS companion switch in settings">
         Uses IPFS companion extension to support IPFS in the browser.
       </message>

diff --git a/app/brave_main_delegate.cc b/app/brave_main_delegate.cc
@@ -137,8 +137,14 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) {
   command_line.AppendSwitch(switches::kDisableDomainReliability);
   command_line.AppendSwitch(switches::kDisableChromeGoogleURLTrackingClient);
   command_line.AppendSwitch(switches::kNoPings);
-  command_line.AppendSwitchASCII(switches::kExtensionsInstallVerification,
+
+  // Setting these to default values in Chromium to maintain parity
+  // See: ChromeContentVerifierDelegate::GetDefaultMode for ContentVerification
+  // See: GetStatus in install_verifier.cc for InstallVerification
+  command_line.AppendSwitchASCII(switches::kExtensionContentVerification,
       switches::kExtensionContentVerificationEnforceStrict);
+  command_line.AppendSwitchASCII(switches::kExtensionsInstallVerification,
+      "enforce");
 
   // Enabled features.
   const std::unordered_set<const char*> enabled_features = {

diff --git a/browser/brave_profile_prefs.cc b/browser/brave_profile_prefs.cc
@@ -20,6 +20,8 @@
 #include "components/signin/core/browser/signin_pref_names.h"
 #include "components/spellcheck/browser/pref_names.h"
 #include "components/sync/base/pref_names.h"
+#include "extensions/buildflags/buildflags.h"
+#include "extensions/common/feature_switch.h"
 #include "third_party/widevine/cdm/buildflags.h"
 
 #if BUILDFLAG(BUNDLE_WIDEVINE_CDM)
@@ -34,6 +36,8 @@
 #include "brave/browser/tor/tor_profile_service.h"
 #endif
 
+using extensions::FeatureSwitch;
+
 namespace brave {
 
 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -82,6 +86,15 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   // Media Router
   registry->SetDefaultPrefValue(prefs::kEnableMediaRouter, base::Value(false));
 
+  // 1. We do not want to enable the MediaRouter pref directly, so
+  // using a proxy pref to handle Media Router setting
+  // 2. On upgrade users might have enabled Media Router and the pref should
+  // be set correctly, so we use feature switch to set the initial value
+#if BUILDFLAG(ENABLE_EXTENSIONS)
+  registry->RegisterBooleanPref(kBraveEnabledMediaRouter,
+      FeatureSwitch::load_media_router_component_extension()->IsEnabled());
+#endif
+
   // No sign into Brave functionality
   registry->SetDefaultPrefValue(prefs::kSigninAllowed, base::Value(false));
 

diff --git a/browser/extensions/api/settings_private/brave_prefs_util.cc b/browser/extensions/api/settings_private/brave_prefs_util.cc
@@ -83,6 +83,9 @@ const PrefsUtil::TypedPrefMap& BravePrefsUtil::GetWhitelistedKeys() {
   // IPFS Companion pref
   (*s_brave_whitelist)[kIPFSCompanionEnabled] =
       settings_api::PrefType::PREF_TYPE_BOOLEAN;
+  // Media Router Pref
+  (*s_brave_whitelist)[kBraveEnabledMediaRouter] =
+      settings_api::PrefType::PREF_TYPE_BOOLEAN;
   return *s_brave_whitelist;
 }
 

diff --git a/browser/net/brave_common_static_redirect_network_delegate_helper.cc b/browser/net/brave_common_static_redirect_network_delegate_helper.cc
@@ -45,13 +45,33 @@ int OnBeforeURLRequest_CommonStaticRedirectWork(
     const ResponseCallback& next_callback,
     std::shared_ptr<BraveRequestInfo> ctx) {
   GURL::Replacements replacements;
+  static URLPattern chromecast_pattern(
+      URLPattern::SCHEME_HTTP | URLPattern::SCHEME_HTTPS, kChromeCastPrefix);
+  static URLPattern clients4_pattern(
+      URLPattern::SCHEME_HTTP | URLPattern::SCHEME_HTTPS, kClients4Prefix);
+
   if (IsUpdaterURL(ctx->request_url)) {
     replacements.SetQueryStr(ctx->request_url.query_piece());
     ctx->new_url_spec = GURL(kBraveUpdatesExtensionsEndpoint)
                             .ReplaceComponents(replacements)
                             .spec();
     return net::OK;
   }
+
+  if (chromecast_pattern.MatchesURL(ctx->request_url)) {
+    replacements.SetSchemeStr("https");
+    replacements.SetHostStr(kBraveRedirectorProxy);
+    ctx->new_url_spec = ctx->request_url.ReplaceComponents(replacements).spec();
+    return net::OK;
+  }
+
+  if (clients4_pattern.MatchesHost(ctx->request_url)) {
+    replacements.SetSchemeStr("https");
+    replacements.SetHostStr(kBraveClients4Proxy);
+    ctx->new_url_spec = ctx->request_url.ReplaceComponents(replacements).spec();
+    return net::OK;
+  }
+
   return net::OK;
 }
 

diff --git a/browser/net/brave_common_static_redirect_network_delegate_helper_unittest.cc b/browser/net/brave_common_static_redirect_network_delegate_helper_unittest.cc
@@ -75,4 +75,51 @@ TEST_F(BraveCommonStaticRedirectNetworkDelegateHelperTest,
   EXPECT_EQ(ret, net::OK);
 }
 
+TEST_F(BraveCommonStaticRedirectNetworkDelegateHelperTest,
+    RedirectChromecastDownload) {
+  net::TestDelegate test_delegate;
+  GURL url(
+      "http://redirector.gvt1.com/edgedl/chromewebstore/"
+      "random_hash/random_version_pkedcjkdefgpdelpbcmbmeomcjbeemfm.crx");
+  std::unique_ptr<net::URLRequest> request = context()->CreateRequest(
+      url, net::IDLE, &test_delegate, TRAFFIC_ANNOTATION_FOR_TESTS);
+
+  std::shared_ptr<brave::BraveRequestInfo> before_url_context(
+      new brave::BraveRequestInfo());
+  brave::BraveRequestInfo::FillCTXFromRequest(request.get(),
+                                              before_url_context);
+  brave::ResponseCallback callback;
+
+  int ret = OnBeforeURLRequest_CommonStaticRedirectWork(callback,
+      before_url_context);
+  GURL redirect = GURL(before_url_context->new_url_spec);
+  EXPECT_EQ(redirect.host(), kBraveRedirectorProxy);
+  EXPECT_TRUE(redirect.SchemeIs(url::kHttpsScheme));
+  EXPECT_EQ(redirect.path(), url.path());
+  EXPECT_EQ(ret, net::OK);
+}
+
+TEST_F(BraveCommonStaticRedirectNetworkDelegateHelperTest,
+    RedirectGoogleClients4) {
+  net::TestDelegate test_delegate;
+  GURL url(
+      "https://clients4.google.com/chrome-sync/dev");
+  std::unique_ptr<net::URLRequest> request = context()->CreateRequest(
+      url, net::IDLE, &test_delegate, TRAFFIC_ANNOTATION_FOR_TESTS);
+
+  std::shared_ptr<brave::BraveRequestInfo> before_url_context(
+      new brave::BraveRequestInfo());
+  brave::BraveRequestInfo::FillCTXFromRequest(request.get(),
+                                              before_url_context);
+  brave::ResponseCallback callback;
+
+  int ret = OnBeforeURLRequest_CommonStaticRedirectWork(callback,
+      before_url_context);
+  GURL redirect = GURL(before_url_context->new_url_spec);
+  EXPECT_EQ(redirect.host(), kBraveClients4Proxy);
+  EXPECT_TRUE(redirect.SchemeIs(url::kHttpsScheme));
+  EXPECT_EQ(redirect.path(), url.path());
+  EXPECT_EQ(ret, net::OK);
+}
+
 }  // namespace
diff --git a/...esources/settings/brave_default_extensions_page/brave_default_extensions_browser_proxy.js b/...esources/settings/brave_default_extensions_page/brave_default_extensions_browser_proxy.js
@@ -11,6 +11,7 @@ cr.define('settings', function() {
     setWebTorrentEnabled(value) {}
     setHangoutsEnabled(value) {}
     setIPFSCompanionEnabled(value) {}
+    getRestartNeeded() {}
   }
 
   /**
@@ -27,6 +28,12 @@ cr.define('settings', function() {
     setIPFSCompanionEnabled(value) {
       chrome.send('setIPFSCompanionEnabled', [value]);
     }
+    setMediaRouterEnabled(value) {
+      chrome.send('setMediaRouterEnabled', [value]);
+    }
+    getRestartNeeded() {
+      return cr.sendWithPromise('getRestartNeeded');
+    }
   }
 
   cr.addSingletonGetter(BraveDefaultExtensionsBrowserProxyImpl);

diff --git a/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_page.html b/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_page.html
@@ -3,6 +3,7 @@
 
 <link rel="import" href="chrome://resources/cr_elements/cr_link_row/cr_link_row.html">
 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
+<link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
 <link rel="import" href="brave_default_extensions_browser_proxy.html">
 <link rel="import" href="../settings_page/settings_section.html">
 <link rel="import" href="../settings_shared_css.html">
@@ -14,6 +15,53 @@
       .settings-row:not(:first-child) {
         border-top: var(--cr-separator-line);
       }
+
+      #needsRestart {
+        background-color: #fff;
+        bottom: 0;
+        box-shadow: 0 -2px 2px 0 var(--shadow-color);
+        box-sizing: border-box;
+        left: 0;
+        opacity: 1;
+        padding: 16px;
+        position: fixed;
+        transform: translate(0);
+        transition: all 225ms var(--ease-in-out);
+        width: 100%;
+        z-index: 10;
+      }
+
+      :host-context([dark]) #needsRestart {
+        background-color: #161719;
+      }
+
+      #needsRestart .flex:last-child {
+        text-align: right; /* csschecker-disable-line left-right */
+      }
+
+      .flex {
+        align-self: center;
+        flex: 1 1 auto;
+      }
+
+      .flex-container {
+        display: flex;
+        padding: 8px 1em;
+      }
+
+      .restart-notice {
+        font-size: .9375rem;
+        line-height: 1.4;
+      }
+
+      button.primary {
+        background: var(--interactive-color);
+        border: 0;
+        border-radius: 3px;
+        color: white;
+        font-size: .875rem;
+        padding: 14px 38px;
+      }
     </style>
     <settings-toggle-button id="webTorrentEnabled"
         class="first"
@@ -34,11 +82,30 @@
         sub-label="$i18n{ipfsCompanionEnabledDesc}"
         on-settings-boolean-control-change="onIPFSCompanionEnabledChange_">
     </settings-toggle-button>
+    <settings-toggle-button id="mediaRouterEnabled"
+        pref="{{prefs.brave.enable_media_router}}"
+        label="Media Router"
+        sub-label="$i18n{mediaRouterEnabledDesc}"
+        on-settings-boolean-control-change="onMediaRouterEnabledChange_">
+    </settings-toggle-button>
     <div class="settings-row" id="manageExtensionsRow">
       <cr-link-row icon-class="icon-external"
         label="$i18n{manageExtensionsLabel}" on-click="openExtensionsPage_">
       </cr-link-row>
     </div>
+  <template is="dom-if" if="{{ showRestartToast }}">
+    <div id="needsRestart">
+        <div class="flex-container">
+          <div class="flex restart-notice" jstcache="0">$i18n{restartNotice}</div>
+          <div class="flex">
+            <button id="restartButton" class="primary" tabindex="9" on-click="restartBrowser_">
+            $i18n{relaunchButtonLabel}
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </template>
   </template>
   <script src="brave_default_extensions_page.js"></script>
 </dom-module>
diff --git a/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_page.js b/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_page.js
@@ -12,12 +12,23 @@
 Polymer({
   is: 'settings-brave-default-extensions-page',
 
+  behaviors: [
+    WebUIListenerBehavior,
+  ],
+
   /** @private {?settings.BraveDefaultExtensionsBrowserProxy} */
   browserProxy_: null,
+  showRestartToast: false,
 
   /** @override */
   created: function() {
     this.browserProxy_ = settings.BraveDefaultExtensionsBrowserProxyImpl.getInstance();
+    this.browserProxy_.getRestartNeeded().then(show => {
+      this.showRestartToast = show;
+    });
+    this.addWebUIListener('brave-needs-restart-changed', (needsRestart) => {
+      this.showRestartToast = needsRestart
+    })
   },
 
   /** @override */
@@ -26,6 +37,7 @@ Polymer({
     this.onHangoutsEnabledChange_ = this.onHangoutsEnabledChange_.bind(this)
     this.onIPFSCompanionEnabledChange_ = this.onIPFSCompanionEnabledChange_.bind(this)
     this.openExtensionsPage_ = this.openExtensionsPage_.bind(this)
+    this.restartBrowser_ = this.restartBrowser_.bind(this)
   },
 
   onWebTorrentEnabledChange_: function() {
@@ -40,6 +52,14 @@ Polymer({
     this.browserProxy_.setIPFSCompanionEnabled(this.$.ipfsCompanionEnabled.checked);
   },
 
+  restartBrowser_: function() {
+    window.open("chrome://restart", "_self");
+  },
+
+  onMediaRouterEnabledChange_: function() {
+    this.browserProxy_.setMediaRouterEnabled(this.$.mediaRouterEnabled.checked);
+  },
+
   openExtensionsPage_: function() {
     window.open("chrome://extensions", "_self");
   },