Merge pull request #15198 from brave/views/pulse

Added BraveHelpBubbleView as part of the new onboarding flow
brave · Dec 7, 2023 · 8534c2c · 8534c2c
2 parents 20a12f4 + 7d48b0a
commit 8534c2c
Show file tree

Hide file tree

Showing 24 changed files with 1,295 additions and 1 deletion.
diff --git a/browser/brave_local_state_prefs.cc b/browser/brave_local_state_prefs.cc
@@ -56,6 +56,10 @@
 #include "chrome/browser/first_run/first_run.h"
 #endif  // !BUILDFLAG(IS_ANDROID)
 
+#if defined(TOOLKIT_VIEWS)
+#include "brave/browser/onboarding/onboarding_tab_helper.h"
+#endif
+
 #if BUILDFLAG(ENABLE_BRAVE_VPN)
 #include "brave/components/brave_vpn/common/brave_vpn_utils.h"
 #endif
@@ -124,6 +128,10 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
   whats_new::RegisterLocalStatePrefs(registry);
 #endif
 
+#if defined(TOOLKIT_VIEWS)
+  onboarding::RegisterLocalStatePrefs(registry);
+#endif
+
 #if BUILDFLAG(ENABLE_CRASH_DIALOG)
   registry->RegisterBooleanPref(kDontAskForCrashReporting, false);
 #endif

diff --git a/browser/brave_tab_helpers.cc b/browser/brave_tab_helpers.cc
@@ -92,6 +92,10 @@
 #include "brave/browser/playlist/playlist_tab_helper.h"
 #endif
 
+#if defined(TOOLKIT_VIEWS)
+#include "brave/browser/onboarding/onboarding_tab_helper.h"
+#endif
+
 namespace brave {
 
 #if defined(TOOLKIT_VIEWS)
@@ -171,6 +175,10 @@ void AttachTabHelpers(content::WebContents* web_contents) {
 
   BraveNewsTabHelper::MaybeCreateForWebContents(web_contents);
 
+#if defined(TOOLKIT_VIEWS)
+  OnboardingTabHelper::MaybeCreateForWebContents(web_contents);
+#endif
+
   if (base::FeatureList::IsEnabled(net::features::kBraveEphemeralStorage)) {
     ephemeral_storage::EphemeralStorageTabHelper::CreateForWebContents(
         web_contents);

diff --git a/browser/onboarding/BUILD.gn b/browser/onboarding/BUILD.gn
@@ -0,0 +1,19 @@
+# Copyright (c) 2023 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/.
+
+source_set("unit_tests") {
+  testonly = true
+
+  sources = [ "onboarding_unittest.cc" ]
+
+  deps = [
+    "//base",
+    "//brave/browser",
+    "//chrome/browser",
+    "//chrome/test:test_support",
+    "//content/test:test_support",
+    "//testing/gtest",
+  ]
+}
diff --git a/browser/onboarding/domain_map.cc b/browser/onboarding/domain_map.cc
@@ -0,0 +1,180 @@
+/* Copyright (c) 2023 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/onboarding/domain_map.h"
+
+#include <string_view>
+
+#include "base/containers/fixed_flat_map.h"
+#include "base/containers/flat_set.h"
+#include "base/strings/string_util.h"
+#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
+#include "url/gurl.h"
+
+namespace onboarding {
+
+namespace {
+
+constexpr auto kDomains =
+    base::MakeFixedFlatMap<std::string_view, std::string_view>({
+        {"2mdn.net", "Google"},
+        {"admeld.com", "Google"},
+        {"admob.com", "Google"},
+        {"apture.com", "Google"},
+        {"blogger.com", "Google"},
+        {"cc-dt.com", "Google"},
+        {"crashlytics.com", "Google"},
+        {"destinationurl.com", "Google"},
+        {"doubleclick.net", "Google"},
+        {"ggpht.com", "Google"},
+        {"gmail.com", "Google"},
+        {"gmodules.com", "Google"},
+        {"google-analytics.com", "Google"},
+        {"google.ac", "Google"},
+        {"google.ad", "Google"},
+        {"google.ae", "Google"},
+        {"google.al", "Google"},
+        {"google.am", "Google"},
+        {"google.as", "Google"},
+        {"google.at", "Google"},
+        {"google.az", "Google"},
+        {"google.ba", "Google"},
+        {"google.be", "Google"},
+        {"google.bf", "Google"},
+        {"google.bg", "Google"},
+        {"google.bi", "Google"},
+        {"google.bj", "Google"},
+        {"google.bs", "Google"},
+        {"google.bt", "Google"},
+        {"google.by", "Google"},
+        {"google.ca", "Google"},
+        {"google.cat", "Google"},
+        {"google.cc", "Google"},
+        {"google.cd", "Google"},
+        {"google.cf", "Google"},
+        {"google.cg", "Google"},
+        {"google.ch", "Google"},
+        {"google.ci", "Google"},
+        {"google.cl", "Google"},
+        {"google.cm", "Google"},
+        {"google.cn", "Google"},
+        {"google.co.ao", "Google"},
+        {"google.co.bw", "Google"},
+        {"google.co.ck", "Google"},
+        {"google.co.cr", "Google"},
+        {"google.co.id", "Google"},
+        {"google.co.il", "Google"},
+        {"google.co.in", "Google"},
+        {"google.co.jp", "Google"},
+        {"google.co.ke", "Google"},
+        {"google.co.kr", "Google"},
+        {"google.co.ls", "Google"},
+        {"google.co.ma", "Google"},
+        {"google.co.mz", "Google"},
+        {"google.co.nz", "Google"},
+        {"google.co.th", "Google"},
+        {"google.co.tz", "Google"},
+        {"google.co.ug", "Google"},
+        {"google.co.uk", "Google"},
+        {"google.co.uz", "Google"},
+        {"google.co.ve", "Google"},
+        {"google.co.vi", "Google"},
+        {"google.co.za", "Google"},
+        {"google.co.zm", "Google"},
+        {"google.co.zw", "Google"},
+        {"google.com", "Google"},
+        {"google.com.af", "Google"},
+        {"google.com.ag", "Google"},
+        {"google.com.ai", "Google"},
+        {"google.com.ar", "Google"},
+        {"google.com.au", "Google"},
+        {"google.com.bd", "Google"},
+        {"google.com.bh", "Google"},
+        {"google.com.bn", "Google"},
+        {"google.com.bo", "Google"},
+        {"google.com.br", "Google"},
+        {"google.com.bz", "Google"},
+        {"google.com.co", "Google"},
+        {"google.com.cu", "Google"},
+        {"google.com.cy", "Google"},
+        {"google.com.do", "Google"},
+        {"google.com.ec", "Google"},
+        {"google.com.eg", "Google"},
+        {"google.com.et", "Google"},
+        {"google.com.fj", "Google"},
+        {"google.com.gh", "Google"},
+        {"google.com.gi", "Google"},
+        {"google.com.gt", "Google"},
+        {"googletagservices.com", "Google"},
+        {"youtube.com", "Google"},
+        // Amazon
+        {"alexa.com", "Amazon"},
+        {"alexametrics.com", "Amazon"},
+        {"amazon-adsystem.com", "Amazon"},
+        {"amazon.ca", "Amazon"},
+        {"amazon.co.jp", "Amazon"},
+        {"amazon.co.uk", "Amazon"},
+        {"amazon.com", "Amazon"},
+        {"amazon.de", "Amazon"},
+        {"amazon.es", "Amazon"},
+        {"amazon.fr", "Amazon"},
+        {"amazon.it", "Amazon"},
+        {"amazonaws.com", "Amazon"},
+        {"assoc-amazon.com", "Amazon"},
+        {"cloudfront.net", "Amazon"},
+        {"ssl-images-amazon.com", "Amazon"},
+        // Facebook
+        {"apps.fbsbx.com", "Facebook"},
+        {"atdmt.com", "Facebook"},
+        {"atlassolutions.com", "Facebook"},
+        {"facebook.com", "Facebook"},
+        {"facebook.de", "Facebook"},
+        {"facebook.fr", "Facebook"},
+        {"facebook.net", "Facebook"},
+        {"fb.com", "Facebook"},
+        {"fb.me", "Facebook"},
+        {"fbcdn.net", "Facebook"},
+        {"fbsbx.com", "Facebook"},
+        {"friendfeed.com", "Facebook"},
+        {"instagram.com", "Facebook"},
+        {"messenger.com", "Facebook"},
+    });
+
+std::string GetCompanyNameFromGURL(const GURL& url) {
+  const auto host = net::registry_controlled_domains::GetDomainAndRegistry(
+      url, net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
+
+  return kDomains.contains(host) ? std::string(kDomains.at(host))
+                                 : std::string();
+}
+
+}  // namespace
+
+std::pair<std::string, int> GetCompanyNamesAndCountFromAdsList(
+    const std::vector<GURL>& ads_list) {
+  std::string company_names;
+  base::flat_set<std::string> company_names_set;
+  int total_count = 0;
+
+  for (const GURL& url : ads_list) {
+    std::string company_name = GetCompanyNameFromGURL(url);
+    if (company_name.empty()) {
+      continue;
+    }
+    company_names_set.insert(company_name);
+    total_count++;
+  }
+
+  if (!company_names_set.empty()) {
+    company_names =
+        base::JoinString(std::vector<std::string>(company_names_set.begin(),
+                                                  company_names_set.end()),
+                         ", ");
+  }
+
+  return {company_names, total_count};
+}
+
+}  // namespace onboarding
diff --git a/browser/onboarding/domain_map.h b/browser/onboarding/domain_map.h
@@ -0,0 +1,22 @@
+/* Copyright (c) 2023 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_ONBOARDING_DOMAIN_MAP_H_
+#define BRAVE_BROWSER_ONBOARDING_DOMAIN_MAP_H_
+
+#include <string>
+#include <utility>
+#include <vector>
+
+class GURL;
+
+namespace onboarding {
+
+std::pair<std::string, int> GetCompanyNamesAndCountFromAdsList(
+    const std::vector<GURL>& ads_list);
+
+}  // namespace onboarding
+
+#endif  // BRAVE_BROWSER_ONBOARDING_DOMAIN_MAP_H_