brave · yrliou · Nov 5, 2019 · Nov 5, 2019 · Nov 6, 2019 · Nov 7, 2019
diff --git a/BUILD.gn b/BUILD.gn
@@ -473,6 +473,7 @@ if (is_mac) {
       "--brave_product_dir_name=" + brave_product_dir_name,
       "--brave_feed_url=" + brave_feed_url,
       "--brave_dsa_file=" + brave_dsa_file,
+      "--brave_version=" + brave_version,
     ]
 
     deps = [

diff --git a/DEPS b/DEPS
@@ -14,10 +14,10 @@ deps = {
   "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@13bb40a215248cfbdd87d0a6b425c8397402e9e6",
   "vendor/bat-native-anonize": "https://github.com/brave-intl/bat-native-anonize.git@e3742ba3e8942eea9e4755d91532491871bd3116",
-  "vendor/bat-native-tweetnacl": "https://github.com/brave-intl/bat-native-tweetnacl.git@dd0c535898a645b84d6f3372b393bdad6746108c",
+  "vendor/bat-native-tweetnacl": "https://github.com/brave-intl/bat-native-tweetnacl.git@800f9d40b7409239ff192e0be634764e747c7a75",
   "components/brave_sync/extension/brave-sync": "https://github.com/brave/sync.git@8a9f4fefe42c25b5359c402f97f454fa333c8d48",
-  "vendor/bat-native-usermodel": "https://github.com/brave-intl/bat-native-usermodel.git@a82acda22d8cb255d86ee28734efb8ad886e9a49",
-  "vendor/challenge_bypass_ristretto_ffi": "https://github.com/brave-intl/challenge-bypass-ristretto-ffi.git@f88d942ddfaf61a4a6703355a77c4ef71bc95c35",
+  "vendor/bat-native-usermodel": "https://github.com/brave-intl/bat-native-usermodel.git@45e32155af9897dbe1d5534dd36697ec4728bb75",
+  "vendor/challenge_bypass_ristretto_ffi": "https://github.com/brave-intl/challenge-bypass-ristretto-ffi.git@c396fb4eb9e9bf63b89ae5a0ec0b5f201d43c7c5",
 }
 
 hooks = [

diff --git a/LICENSE b/LICENSE
@@ -1,26 +1,5 @@
-LICENSES FOR INCORPORATED CODEBASES
-===================================
-
-Incorporating code from Privacy Badger Chrome,
-https://github.com/EFForg/privacybadger
-Copyright © 2015 Electronic Frontier Foundation and other contributors
-Licensed GPL v3
-
-Incorporating code from HTTPS Everywhere,
-Copyright © 2010-2017 Electronic Frontier Foundation and others
-Licensed GPL v2+
-
-Incorporating code from Chameleon,
-https://github.com/ghostwords/chameleon
-Copyright © 2015 ghostwords
-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/.
-Alternatively, this code may be distributed or
-otherwise used under the terms of GPL v3
-
-Text of Mozilla Public License Version 2.0
-==========================================
+Mozilla Public License Version 2.0
+==================================
 
 1. Definitions
 --------------
@@ -378,7 +357,7 @@ Exhibit A - Source Code Form License Notice
 
   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/.
+  file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 If it is not possible or desirable to put the notice in a particular
 file, then You may include the notice in a location (such as a LICENSE

diff --git a/app/brave_generated_resources.grd b/app/brave_generated_resources.grd
@@ -640,6 +640,11 @@ By installing this extension, you are agreeing to the Google Widevine Terms of U
       <message name="IDS_BRAVE_CRYPTO_WALLETS_SETUP" desc="Use Crypto Wallets">
         SETUP
       </message>
+      <!-- Brave's copyright statement -->
+      <message name="IDS_BRAVE_VERSION_UI_LICENSE" desc="The label below the copyright message, containing the URLs.">
+        Brave is made available to you under the <ph name="BEGIN_LINK_MPL">&lt;a target="_blank" href="$1"&gt;</ph>Mozilla Public License 2.0<ph name="END_LINK_MPL">&lt;/a&gt;</ph> (MPL) and includes <ph name="BEGIN_LINK_OSS">&lt;a target="_blank" href="$2"&gt;</ph>open source software<ph name="END_LINK_OSS">&lt;/a&gt;</ph> under a variety of other licenses.
+        You can read <ph name="BEGIN_LINK_BUILD_INSTRUCTIONS">&lt;a target="_blank" href="$3"&gt;</ph>instructions on how to download and build for yourself<ph name="END_LINK_BUILD_INSTRUCTIONS">&lt;/a&gt;</ph> the specific <ph name="BEGIN_LINK_SOURCE_CODE">&lt;a target="_blank" href="$4"&gt;</ph>source code used to create this copy<ph name="END_LINK_SOURCE_CODE">&lt;/a&gt;</ph>.
+      </message>
     </messages>
     <includes>
       <include name="IDR_BRAVE_GOOGLE_ANALYTICS_POLYFILL" file="resources/js/google_analytics_polyfill.js" type="BINDATA" />

diff --git a/browser/extensions/api/brave_rewards_api.cc b/browser/extensions/api/brave_rewards_api.cc
@@ -1084,5 +1084,24 @@ void BraveRewardsGetWalletExistsFunction::OnGetWalletExists(
   Respond(OneArgument(std::make_unique<base::Value>(exists)));
 }
 
+BraveRewardsGetAdsSupportedFunction::
+~BraveRewardsGetAdsSupportedFunction() {
+}
+
+ExtensionFunction::ResponseAction
+BraveRewardsGetAdsSupportedFunction::Run() {
+  Profile* profile = Profile::FromBrowserContext(browser_context());
+  AdsService* ads_service_ =
+      AdsServiceFactory::GetForProfile(profile);
+
+  if (!ads_service_) {
+    return RespondNow(Error("Ads service is not initialized"));
+  }
+
+  const bool supported = ads_service_->IsSupportedLocale();
+  return RespondNow(
+      OneArgument(std::make_unique<base::Value>(supported)));
+}
+
 }  // namespace api
 }  // namespace extensions
diff --git a/browser/extensions/api/brave_rewards_api.h b/browser/extensions/api/brave_rewards_api.h
@@ -430,6 +430,16 @@ class BraveRewardsGetWalletExistsFunction
   void OnGetWalletExists(const bool exists);
 };
 
+class BraveRewardsGetAdsSupportedFunction : public ExtensionFunction {
+ public:
+  DECLARE_EXTENSION_FUNCTION("braveRewards.getAdsSupported", UNKNOWN)
+
+ protected:
+  ~BraveRewardsGetAdsSupportedFunction() override;
+
+  ResponseAction Run() override;
+};
+
 }  // namespace api
 }  // namespace extensions
 

diff --git a/browser/profiles/profile_util.cc b/browser/profiles/profile_util.cc
@@ -195,6 +195,14 @@ bool IsGuestProfile(content::BrowserContext* context) {
       ->IsGuestSession();
 }
 
+bool IsTorDisabledForProfile(Profile* profile) {
+#if BUILDFLAG(ENABLE_TOR)
+  return profile->IsGuestSession();
+#else
+  return true;
+#endif
+}
+
 }  // namespace brave
 
 namespace chrome {

diff --git a/browser/profiles/profile_util.h b/browser/profiles/profile_util.h
@@ -43,6 +43,8 @@ Profile* GetParentProfile(const base::FilePath& path);
 // the guest profile by calling IsGuestSession and have to use this function.
 bool IsGuestProfile(content::BrowserContext* profile);
 
+bool IsTorDisabledForProfile(Profile* profile);
+
 }  // namespace brave
 
 namespace chrome {

diff --git a/browser/resources/settings/brave_settings_overrides.js b/browser/resources/settings/brave_settings_overrides.js
@@ -356,7 +356,17 @@ BravePatching.RegisterPolymerTemplateModifications({
       console.error('[Brave Settings Overrides] Could not find manage payments link')
     }
     manageLink.remove()
-  }
+  },
+  'settings-about-page': (templateContent) => {
+    const section = getSectionElement(templateContent, 'about')
+    if (!section.querySelector('a#release-notes')) {
+      const version = section.querySelector('#updateStatusMessage ~ .secondary')
+      if (!version) {
+        console.error('[Brave Settings Overrides] Could not find version div')
+      }
+      version.innerHTML = '<a id="release-notes" target="_blank" href="https://brave.com/latest/">' + version.innerHTML + '</a>'
+    }
+  },
 })
 
 // Icons

diff --git a/browser/ui/BUILD.gn b/browser/ui/BUILD.gn
@@ -66,6 +66,8 @@ source_set("ui") {
       "webui/brave_settings_ui.h",
       "webui/navigation_bar_data_provider.cc",
       "webui/navigation_bar_data_provider.h",
+      "webui/settings/brave_about_handler.cc",
+      "webui/settings/brave_about_handler.h",
       "webui/settings/brave_privacy_handler.cc",
       "webui/settings/brave_privacy_handler.h",
       "webui/settings/default_brave_shields_handler.cc",
@@ -184,7 +186,10 @@ source_set("ui") {
   }
 
   if (!is_android) {
-    deps += [ "//brave/app:brave_generated_resources_grit" ]
+    deps += [
+      "//brave/app:brave_generated_resources_grit",
+      "//brave/browser:version_info",
+    ]
   }
 
   if (enable_extensions && toolkit_views) {

diff --git a/browser/ui/brave_browser_command_controller.cc b/browser/ui/brave_browser_command_controller.cc
@@ -133,8 +133,10 @@ void BraveBrowserCommandController::UpdateCommandForBraveAdblock() {
 }
 
 void BraveBrowserCommandController::UpdateCommandForTor() {
-  UpdateCommandEnabled(IDC_NEW_TOR_CONNECTION_FOR_SITE, true);
-  UpdateCommandEnabled(IDC_NEW_OFFTHERECORD_WINDOW_TOR, true);
+  const bool is_tor_enabled =
+      !brave::IsTorDisabledForProfile(browser_->profile());
+  UpdateCommandEnabled(IDC_NEW_TOR_CONNECTION_FOR_SITE, is_tor_enabled);
+  UpdateCommandEnabled(IDC_NEW_OFFTHERECORD_WINDOW_TOR, is_tor_enabled);
 }
 
 void BraveBrowserCommandController::UpdateCommandForBraveSync() {

diff --git a/browser/ui/views/brave_actions/brave_actions_container.cc b/browser/ui/views/brave_actions/brave_actions_container.cc
@@ -179,7 +179,8 @@ void BraveActionsContainer::AddActionStubForRewards() {
     return;
   }
 #if BUILDFLAG(BRAVE_REWARDS_ENABLED)
-  actions_[id].view_ = std::make_unique<BraveRewardsActionStubView>(this);
+  actions_[id].view_ = std::make_unique<BraveRewardsActionStubView>(
+      browser_->profile(), this);
   AttachAction(actions_[id]);
 #endif
 }

diff --git a/browser/ui/views/brave_actions/brave_rewards_action_stub_view.cc b/browser/ui/views/brave_actions/brave_rewards_action_stub_view.cc
@@ -11,10 +11,13 @@
 
 #include "brave/browser/ui/brave_actions/brave_action_icon_with_badge_image_source.h"  // NOLINT
 #include "brave/browser/ui/brave_actions/constants.h"
+#include "brave/components/brave_rewards/common/pref_names.h"
 #include "brave/components/brave_rewards/resources/extension/grit/brave_rewards_extension_resources.h"  // NOLINT
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/views/chrome_layout_provider.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_ink_drop_util.h"
+#include "components/prefs/pref_service.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/geometry/rect.h"
@@ -29,12 +32,12 @@
 
 namespace {
   constexpr SkColor kRewardsBadgeBg = SkColorSetRGB(0xfb, 0x54, 0x2b);
-  const std::string kRewardsInitialBadgeText = "1";
 }
 
-BraveRewardsActionStubView::BraveRewardsActionStubView(
+BraveRewardsActionStubView::BraveRewardsActionStubView(Profile* profile,
     BraveRewardsActionStubView::Delegate* delegate)
     : LabelButton(this, base::string16()),
+      profile_(profile),
       delegate_(delegate) {
   SetInkDropMode(InkDropMode::ON);
   set_has_ink_drop_action_on_click(true);
@@ -55,8 +58,13 @@ BraveRewardsActionStubView::BraveRewardsActionStubView(
   image_source->SetIcon(gfx::Image(image));
   // Set text on badge
   std::unique_ptr<IconWithBadgeImageSource::Badge> badge;
+  // TODO(petemill): Provide an observer if this value is expected to change
+  // during runtime. At time of implementation, this would only be different
+  // after a restart.
+  badge_text_pref_.Init(
+    brave_rewards::prefs::kRewardsBadgeText, profile->GetPrefs());
   badge.reset(new IconWithBadgeImageSource::Badge(
-          kRewardsInitialBadgeText,
+          badge_text_pref_.GetValue(),
           SK_ColorWHITE,
           kRewardsBadgeBg));
   image_source->SetBadge(std::move(badge));
@@ -85,6 +93,15 @@ BraveRewardsActionStubView::~BraveRewardsActionStubView() {}
 
 void BraveRewardsActionStubView::ButtonPressed(
     Button* sender, const ui::Event& event) {
+  // We only show the default badge text once, so once the button
+  // is clicked then change it back. We consider pressing the button
+  // as an action to 'dismiss' the badge notification.
+  // This cannot be done from the rewards service since it is not
+  // involved in showing the pre-opt-in panel.
+  if (badge_text_pref_.GetValue() != "") {
+    profile_->GetPrefs()->SetString(brave_rewards::prefs::kRewardsBadgeText,
+        "");
+  }
   delegate_->OnRewardsStubButtonClicked();
 }
 

diff --git a/browser/ui/views/brave_actions/brave_rewards_action_stub_view.h b/browser/ui/views/brave_actions/brave_rewards_action_stub_view.h
@@ -8,9 +8,12 @@
 
 #include <memory>
 
+#include "components/prefs/pref_member.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/view.h"
 
+class Profile;
+
 // A button to take the place of an extension that will be loaded in the future.
 // Call SetImage with the BraveActionIconWithBadgeImageSource
 // Call highlight etc from ToolbarActionView
@@ -25,7 +28,7 @@ class BraveRewardsActionStubView : public views::LabelButton,
     ~Delegate() {}
   };
 
-  explicit BraveRewardsActionStubView(Delegate* delegate);
+  explicit BraveRewardsActionStubView(Profile* profile, Delegate* delegate);
   ~BraveRewardsActionStubView() override;
 
   // views::ButtonListener
@@ -41,6 +44,8 @@ class BraveRewardsActionStubView : public views::LabelButton,
  private:
   gfx::Size CalculatePreferredSize() const override;
 
+  StringPrefMember badge_text_pref_;
+  Profile* profile_;
   Delegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(BraveRewardsActionStubView);

diff --git a/browser/ui/webui/brave_webui_source.cc b/browser/ui/webui/brave_webui_source.cc
@@ -212,6 +212,7 @@ void CustomizeWebUIHTMLSource(const std::string &name,
         { "rewardsWidgetEnableTitle", IDS_REWARDS_WIDGET_ENABLE_TITLE },
         { "rewardsWidgetReEnableSubTitle", IDS_REWARDS_WIDGET_REENABLE_SUBTITLE },        // NOLINT
         { "rewardsWidgetEnableSubTitle", IDS_REWARDS_WIDGET_ENABLE_SUBTITLE },            // NOLINT
+        { "rewardsWidgetAdsNotSupported", IDS_BRAVE_REWARDS_LOCAL_ADS_NOT_SUPPORTED },    // NOLINT
         { "rewardsWidgetNotificationTitle", IDS_REWARDS_WIDGET_NOTIFICATION_TITLE },      // NOLINT
         { "rewardsWidgetNotificationTextAds", IDS_REWARDS_WIDGET_NOTIFICATION_TEXT_ADS }, // NOLINT
         { "rewardsWidgetNotificationTextUGP", IDS_REWARDS_WIDGET_NOTIFICATION_TEXT_UGP }  // NOLINT
@@ -357,6 +358,7 @@ void CustomizeWebUIHTMLSource(const std::string &name,
         { "amount", IDS_BRAVE_UI_AMOUNT },
         { "backup", IDS_BRAVE_UI_BACKUP },
         { "braveAdsDesc", IDS_BRAVE_UI_BRAVE_ADS_DESC },
+        { "braveAdsDescPoints", IDS_BRAVE_UI_BRAVE_ADS_DESC_POINTS },
         { "braveAdsLaunchMsg", IDS_BRAVE_UI_BRAVE_ADS_LAUNCH_MSG },
         { "braveAdsLaunchTitle", IDS_BRAVE_UI_BRAVE_ADS_LAUNCH_TITLE },
         { "braveAdsTitle", IDS_BRAVE_UI_BRAVE_ADS_TITLE },
@@ -506,11 +508,13 @@ void CustomizeWebUIHTMLSource(const std::string &name,
         { "rewardsOffText2", IDS_BRAVE_UI_REWARDS_OFF_TEXT2 },
         { "rewardsOffText3", IDS_BRAVE_UI_REWARDS_OFF_TEXT3 },
         { "rewardsOffText4", IDS_BRAVE_UI_REWARDS_OFF_TEXT4 },
+        { "rewardsPanelEmptyTextPoints", IDS_BRAVE_UI_REWARDS_PANEL_EMPTY_TEXT_POINTS },         // NOLINT
         { "rewardsPanelEmptyText1", IDS_BRAVE_UI_REWARDS_PANEL_EMPTY_TEXT1 },
         { "rewardsPanelEmptyText2", IDS_BRAVE_UI_REWARDS_PANEL_EMPTY_TEXT2 },
         { "rewardsPanelEmptyText3", IDS_BRAVE_UI_REWARDS_PANEL_EMPTY_TEXT3 },
         { "rewardsPanelEmptyText4", IDS_BRAVE_UI_REWARDS_PANEL_EMPTY_TEXT4 },
         { "rewardsPanelEmptyText5", IDS_BRAVE_UI_REWARDS_PANEL_EMPTY_TEXT5 },
+        { "rewardsPanelEmptyText6", IDS_BRAVE_UI_REWARDS_PANEL_EMPTY_TEXT6 },
         { "rewardsPanelOffText1", IDS_BRAVE_UI_REWARDS_PANEL_OFF_TEXT1 },
         { "rewardsPanelOffText2", IDS_BRAVE_UI_REWARDS_PANEL_OFF_TEXT2 },
         { "rewardsPanelText1", IDS_BRAVE_UI_REWARDS_PANEL_TEXT1 },

diff --git a/browser/ui/webui/settings/brave_about_handler.cc b/browser/ui/webui/settings/brave_about_handler.cc
@@ -0,0 +1,43 @@
+/* Copyright (c) 2019 The Brave Authors. All rights reserved.
+ * 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 https://mozilla.org/MPL/2.0/. */
+
+#include "brave/browser/ui/webui/settings/brave_about_handler.h"
+
+#include "base/strings/string16.h"
+#include "base/strings/utf_string_conversions.h"
+#include "brave/browser/version_info.h"
+#include "brave/grit/brave_generated_resources.h"
+#include "chrome/browser/ui/webui/settings/about_handler.h"
+#include "chrome/common/url_constants.h"
+#include "content/public/browser/web_ui_data_source.h"
+#include "ui/base/l10n/l10n_util.h"
+
+namespace {
+
+const char kBraveBuildInstructionsUrl[] =
+    "https://github.com/brave/brave-browser/wiki";
+const char kBraveLicenseUrl[] = "https://mozilla.org/MPL/2.0/";
+const char kBraveReleaseTagPrefix[] =
+    "https://github.com/brave/brave-browser/releases/tag/v";
+
+}  // namespace
+
+namespace settings {
+
+AboutHandler* BraveAboutHandler::Create(content::WebUIDataSource* html_source,
+                                        Profile* profile) {
+  AboutHandler* handler = AboutHandler::Create(html_source, profile);
+  base::string16 license = l10n_util::GetStringFUTF16(
+      IDS_BRAVE_VERSION_UI_LICENSE, base::ASCIIToUTF16(kBraveLicenseUrl),
+      base::ASCIIToUTF16(chrome::kChromeUICreditsURL),
+      base::ASCIIToUTF16(kBraveBuildInstructionsUrl),
+      base::ASCIIToUTF16(kBraveReleaseTagPrefix) +
+          base::UTF8ToUTF16(
+              version_info::GetBraveVersionWithoutChromiumMajorVersion()));
+  html_source->AddString("aboutProductLicense", license);
+  return handler;
+}
+
+}  // namespace settings
diff --git a/browser/ui/webui/settings/brave_about_handler.h b/browser/ui/webui/settings/brave_about_handler.h
@@ -0,0 +1,27 @@
+/* Copyright (c) 2019 The Brave Authors. All rights reserved.
+ * 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 https://mozilla.org/MPL/2.0/. */
+
+#ifndef BRAVE_BROWSER_UI_WEBUI_SETTINGS_BRAVE_ABOUT_HANDLER_H_
+#define BRAVE_BROWSER_UI_WEBUI_SETTINGS_BRAVE_ABOUT_HANDLER_H_
+
+class Profile;
+
+namespace content {
+class WebUIDataSource;
+}
+
+namespace settings {
+
+class AboutHandler;
+
+class BraveAboutHandler {
+ public:
+  static AboutHandler* Create(content::WebUIDataSource* html_source,
+                              Profile* profile);
+};
+
+}  // namespace settings
+
+#endif  // BRAVE_BROWSER_UI_WEBUI_SETTINGS_BRAVE_ABOUT_HANDLER_H_