brave · RyanJarv · Aug 8, 2018 · Aug 1, 2018 · Aug 1, 2018 · Aug 1, 2018
diff --git a/BUILD.gn b/BUILD.gn
@@ -7,6 +7,7 @@ import("//build/config/locales.gni")
 import("//build/util/process_version.gni")
 import("//media/cdm/library_cdm/cdm_paths.gni")
 import("//brave/brave_paks.gni")
+import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
 
 if (is_mac) {
   import("//build/config/mac/rules.gni")
@@ -175,23 +176,40 @@ process_version("generate_version") {
 copy("brave_dist_resources") {
   sources = [ "$root_out_dir/version" ]
 
-  if (!is_mac) {
-    sources += [
-      "$root_out_dir/brave_resources.pak",
-      "$root_out_dir/brave_100_percent.pak",
-      "$root_out_dir/brave_200_percent.pak",
-      "$root_out_dir/$brave_exe"
-    ]
-  }
-
   deps = [
     ":brave",
     ":generate_version",
     ":brave_license_dist_resources",
     ":packed_resources",
     "build/$target_os:brave",
+    "//third_party/icu:icudata",
   ]
 
+  if (!is_mac) {
+    sources += [
+      "$root_out_dir/brave_resources.pak",
+      "$root_out_dir/brave_100_percent.pak",
+      "$root_out_dir/brave_200_percent.pak",
+      "$root_out_dir/$brave_exe",
+      "$root_out_dir/chrome_100_percent.pak",
+      "$root_out_dir/chrome_200_percent.pak",
+      "$root_out_dir/icudtl.dat",
+      "$root_out_dir/resources.pak",
+    ]
+
+    if (v8_use_external_startup_data) {
+      sources += [ "$root_out_dir/natives_blob.bin" ]
+      deps += [ "//v8" ]
+
+      if (use_v8_context_snapshot) {
+        sources += [ "$root_out_dir/v8_context_snapshot.bin" ]
+        deps += [ "//tools/v8_context_snapshot" ]
+      } else {
+        sources += [ "$root_out_dir/snapshot_blob.bin" ]
+      }
+    }
+  }
+
   outputs = [
     "$brave_dist_dir/{{source_file_part}}"
   ]

diff --git a/DEPS b/DEPS
@@ -11,10 +11,10 @@ deps = {
   "vendor/python-patch": "https://github.com/svn2github/python-patch@a336a458016ced89aba90dfc3f4c8222ae3b1403",
   "vendor/sparkle": "https://github.com/brave/Sparkle.git@c0759cce415d7c0feae45005c8a013b1898711f0",
   "vendor/bat-native-ledger": "https://github.com/brave-intl/bat-native-ledger@a3e64797bf6ebbfa39a60240db8d82995f97ebd9",
-  "vendor/bat-native-rapidjson": "https://github.com/brave-intl/bat-native-rapidjson.git@744b43313525a047eda4f2e2e689aa88b6c596fa",
-  "vendor/bip39wally-core-native": "https://github.com/brave-intl/bip39wally-core-native.git@e5aba371a56d3e41f7e80e868312446ce7bd434c",
-  "vendor/bat-native-anonize": "https://github.com/brave-intl/bat-native-anonize.git@8f60c03329f475959b44cd22838284e19508ec80",
-  "vendor/bat-native-tweetnacl": "https://github.com/brave-intl/bat-native-tweetnacl.git@d61f0cdc88dd2c4320176d2c514b8dd8dd1f22c2",
+  "vendor/bat-native-rapidjson": "https://github.com/brave-intl/bat-native-rapidjson.git@86aafe2ef89835ae71c9ed7c2527e3bb3000930e",
+  "vendor/bip39wally-core-native": "https://github.com/brave-intl/bip39wally-core-native.git@9b119931c702d55be994117eb505d56310720b1d",
+  "vendor/bat-native-anonize": "https://github.com/brave-intl/bat-native-anonize.git@6f5817c5a4dcabb49e22b578ecae4993159e6481",
+  "vendor/bat-native-tweetnacl": "https://github.com/brave-intl/bat-native-tweetnacl.git@05ed8f82faa03609fe5ae0a4c2d454afbe2ff267",
 }
 
 hooks = [

diff --git a/app/brave_generated_resources.grd b/app/brave_generated_resources.grd
@@ -113,6 +113,28 @@ By installing this extension, you are agreeing to the Google Widevine Terms of U
       <message name="IDS_BOOKMARK_GROUP_FROM_BRAVE" desc="The group name of bookmarks from Brave">
         Imported From Brave
       </message>
+      <!-- Autoplay -->
+      <message name="IDS_AUTOPLAY_PERMISSION_FRAGMENT" desc="Permission request shown if the user is visiting a site that wants to autoplay media. Follows a prompt: 'This site would like to:'">
+        Autoplay media
+      </message>
+      <message name="IDS_SETTINGS_SITE_SETTINGS_AUTOPLAY" desc="Label for autoplay site settings.">
+        Autoplay
+      </message>
+      <message name="IDS_SETTINGS_SITE_SETTINGS_AUTOPLAY_ASK" desc="The ask label for autoplay in site settings.">
+        Ask when a site wants to autoplay media
+      </message>
+      <message name="IDS_SETTINGS_SITE_SETTINGS_AUTOPLAY_ASK_RECOMMENDED" desc="The ask label for autoplay in site settings (with the 'recommended' suffix).">
+        Ask when a site wants to autoplay media (recommended)
+      </message>
+      <message name="IDS_BLOCKED_AUTOPLAY_TITLE" desc="Tooltip and bubble info header text when a page is not allowed to autoplay media.">
+        Autoplay was blocked on this page
+      </message>
+      <message name="IDS_BLOCKED_AUTOPLAY_UNBLOCK" desc="Radio button choice to unblock a site from autoplay media, displayed in bubble when a page tries to autoplay media.">
+        Always allow autoplay on <ph name="HOST">$1<ex>mail.google.com</ex></ph>
+      </message>
+      <message name="IDS_BLOCKED_AUTOPLAY_NO_ACTION" desc="Radio button choice to continue blocking a site from autoplay media, displayed in bubble when a page tries to autoplay media.">
+        Continue blocking autoplay
+      </message>
     </messages>
     <includes>
       <include name="IDR_BRAVE_TAG_SERVICES_POLYFILL" file="resources/js/tag_services_polyfill.js" type="BINDATA" />

diff --git a/app/theme/brave/BRANDING b/app/theme/brave/BRANDING
@@ -1,9 +1,10 @@
 COMPANY_FULLNAME=Brave Software, Inc.
 COMPANY_SHORTNAME=Brave Software
-PRODUCT_FULLNAME=Brave
+PRODUCT_FULLNAME=Brave-Browser
 PRODUCT_SHORTNAME=Brave
 PRODUCT_INSTALLER_FULLNAME=Brave Installer
 PRODUCT_INSTALLER_SHORTNAME=Brave Installer
 COPYRIGHT=Copyright 2016 The Brave Authors. All rights reserved.
 MAC_BUNDLE_ID=org.brave.Brave
 MAC_CREATOR_CODE=Cr24
+MAC_TEAM_ID=
diff --git a/app/theme/brave/BRANDING.beta b/app/theme/brave/BRANDING.beta
@@ -0,0 +1,10 @@
+COMPANY_FULLNAME=Brave Software, Inc.
+COMPANY_SHORTNAME=Brave Software
+PRODUCT_FULLNAME=Brave-Browser-Beta
+PRODUCT_SHORTNAME=Brave
+PRODUCT_INSTALLER_FULLNAME=Brave Installer
+PRODUCT_INSTALLER_SHORTNAME=Brave Installer
+COPYRIGHT=Copyright 2016 The Brave Authors. All rights reserved.
+MAC_BUNDLE_ID=org.brave.Brave.beta
+MAC_CREATOR_CODE=Cr24
+MAC_TEAM_ID=
diff --git a/app/theme/brave/BRANDING.dev b/app/theme/brave/BRANDING.dev
@@ -0,0 +1,10 @@
+COMPANY_FULLNAME=Brave Software, Inc.
+COMPANY_SHORTNAME=Brave Software
+PRODUCT_FULLNAME=Brave-Browser-Dev
+PRODUCT_SHORTNAME=Brave
+PRODUCT_INSTALLER_FULLNAME=Brave Installer
+PRODUCT_INSTALLER_SHORTNAME=Brave Installer
+COPYRIGHT=Copyright 2016 The Brave Authors. All rights reserved.
+MAC_BUNDLE_ID=org.brave.Brave.dev
+MAC_CREATOR_CODE=Cr24
+MAC_TEAM_ID=
diff --git a/app/theme/brave/BRANDING.development b/app/theme/brave/BRANDING.development
@@ -0,0 +1,10 @@
+COMPANY_FULLNAME=Brave Software, Inc.
+COMPANY_SHORTNAME=Brave Software
+PRODUCT_FULLNAME=Brave-Browser-Development
+PRODUCT_SHORTNAME=Brave
+PRODUCT_INSTALLER_FULLNAME=Brave Installer
+PRODUCT_INSTALLER_SHORTNAME=Brave Installer
+COPYRIGHT=Copyright 2016 The Brave Authors. All rights reserved.
+MAC_BUNDLE_ID=org.brave.Brave.development
+MAC_CREATOR_CODE=Cr24
+MAC_TEAM_ID=
diff --git a/app/theme/brave/BRANDING.nightly b/app/theme/brave/BRANDING.nightly
@@ -0,0 +1,10 @@
+COMPANY_FULLNAME=Brave Software, Inc.
+COMPANY_SHORTNAME=Brave Software
+PRODUCT_FULLNAME=Brave-Browser-Nightly
+PRODUCT_SHORTNAME=Brave
+PRODUCT_INSTALLER_FULLNAME=Brave Installer
+PRODUCT_INSTALLER_SHORTNAME=Brave Installer
+COPYRIGHT=Copyright 2016 The Brave Authors. All rights reserved.
+MAC_BUNDLE_ID=org.brave.Brave.nightly
+MAC_CREATOR_CODE=Cr24
+MAC_TEAM_ID=
diff --git a/browser/BUILD.gn b/browser/BUILD.gn
@@ -100,10 +100,11 @@ source_set("browser") {
   ]
 
   deps = [
+    "autoplay",
     "//brave/components/brave_shields/browser:brave_shields",
-    "//brave/components/omnibox/browser:brave_autocomplete",
     "extensions",
     "net",
+    "permissions",
   ]
 
   if (is_mac) {

diff --git a/browser/autoplay/BUILD.gn b/browser/autoplay/BUILD.gn
@@ -0,0 +1,12 @@
+import("//build/config/features.gni")
+
+source_set("autoplay") {
+  sources = [
+    "autoplay_permission_context.cc",
+    "autoplay_permission_context.h",
+  ]
+
+  deps = [
+    "//chrome/browser",
+  ]
+}
diff --git a/browser/autoplay/autoplay_permission_context.cc b/browser/autoplay/autoplay_permission_context.cc
@@ -0,0 +1,58 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "brave/browser/autoplay/autoplay_permission_context.h"
+
+#include "chrome/browser/content_settings/tab_specific_content_settings.h"
+#include "chrome/browser/permissions/permission_request_id.h"
+#include "chrome/common/chrome_features.h"
+#include "components/content_settings/core/common/content_settings_types.h"
+#include "third_party/blink/public/mojom/feature_policy/feature_policy.mojom.h"
+
+AutoplayPermissionContext::AutoplayPermissionContext(Profile* profile)
+    : PermissionContextBase(
+          profile,
+          CONTENT_SETTINGS_TYPE_AUTOPLAY,
+          blink::mojom::FeaturePolicyFeature::kAutoplay) {}
+
+AutoplayPermissionContext::~AutoplayPermissionContext() = default;
+
+void AutoplayPermissionContext::UpdateTabContext(
+    const PermissionRequestID& id,
+    const GURL& requesting_frame,
+    bool allowed) {
+  TabSpecificContentSettings* content_settings =
+      TabSpecificContentSettings::GetForFrame(id.render_process_id(),
+                                              id.render_frame_id());
+  if (!content_settings)
+    return;
+
+  if (!allowed) {
+    content_settings->OnContentBlocked(CONTENT_SETTINGS_TYPE_AUTOPLAY);
+  }
+}
+
+void AutoplayPermissionContext::NotifyPermissionSet(
+    const PermissionRequestID& id,
+    const GURL& requesting_origin,
+    const GURL& embedding_origin,
+    const BrowserPermissionCallback& callback,
+    bool persist,
+    ContentSetting content_setting) {
+  PermissionContextBase::NotifyPermissionSet(id, requesting_origin,
+                                             embedding_origin, callback,
+                                             persist, content_setting);
+  // Ask -> Allow
+  if (persist && content_setting == CONTENT_SETTING_ALLOW) {
+    content::WebContents* web_contents =
+      content::WebContents::FromRenderFrameHost(
+        content::RenderFrameHost::FromID(id.render_process_id(),
+                                         id.render_frame_id()));
+     web_contents->GetController().Reload(content::ReloadType::NORMAL, false);
+  }
+}
+
+bool AutoplayPermissionContext::IsRestrictedToSecureOrigins() const {
+  return false;
+}
diff --git a/browser/autoplay/autoplay_permission_context.h b/browser/autoplay/autoplay_permission_context.h
@@ -0,0 +1,32 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef BRAVE_BROWSER_AUTOPLAY_AUTOPLAY_PERMISSION_CONTEXT_H_
+#define BRAVE_BROWSER_AUTOPLAY_AUTOPLAY_PERMISSION_CONTEXT_H_
+
+#include "base/macros.h"
+#include "chrome/browser/permissions/permission_context_base.h"
+
+class AutoplayPermissionContext : public PermissionContextBase {
+ public:
+  explicit AutoplayPermissionContext(Profile* profile);
+  ~AutoplayPermissionContext() override;
+
+ private:
+  // PermissionContextBase:
+  void UpdateTabContext(const PermissionRequestID& id,
+                        const GURL& requesting_frame,
+                        bool allowed) override;
+  void NotifyPermissionSet(const PermissionRequestID& id,
+                           const GURL& requesting_origin,
+                           const GURL& embedding_origin,
+                           const BrowserPermissionCallback& callback,
+                           bool persist,
+                           ContentSetting content_setting) override;
+  bool IsRestrictedToSecureOrigins() const override;
+
+  DISALLOW_COPY_AND_ASSIGN(AutoplayPermissionContext);
+};
+
+#endif  // BRAVE_BROWSER_AUTOPLAY_AUTOPLAY_PERMISSION_CONTEXT_H_