Rename instances of together

Originally done as separate commits (one at a time) and compiled/tested after each. Fixes brave/brave-browser#17138 - Update component namespace (from `brave_together` to `brave_talk`) - Update extension API (from `braveTogether` to `braveTalk`) - Update strings (from `together`/`TOGETHER` to `braveTalk`/`BRAVE_TALK`) - Rename `showTogether` => `showBraveTalk` - Rename `togetherSupported` => `braveTalkSupported` - Rename constant `kNewTabPageShowTogether` => `kNewTabPageShowBraveTalk` (Does not affect actual profile setting) - Rename Widget (from `TogetherWidget` to `BraveTalkWidget`) - Rename `togetherPromptDismissed` => `braveTalkPromptDismissed` - Rename `supportsTogether` => `supportsBraveTalk` - Rename `saveShowTogether` => `saveShowBraveTalk` - Rename `toggleShowTogether` => `toggleShowBraveTalk` - Rename `TogetherTooltip` => `BraveTalkTooltip` - Rename `TogetherIcon` => `BraveTalkIcon` - Rename `renderTogetherWidget` => `renderBraveTalkWidget` - Rename `dismissTogetherPrompt` => `dismissBraveTalkPrompt` - Rename `onDismissTogetherPrompt` => `onDismissBraveTalkPrompt` - Rename `togetherBanner` => `braveTalkBanner` - Rename `TogetherItem` => `BraveTalkItem` - Rename `BraveTogetherIcon` as `BraveTalkSvg` - Rename "widget stack" name from `together` to `braveTalk`
brave · Aug 3, 2021 · 8b42deb · 8b42deb
1 parent c738da8
commit 8b42deb
Show file tree

Hide file tree

Showing 37 changed files with 164 additions and 164 deletions.
diff --git a/.storybook/locale.ts b/.storybook/locale.ts
@@ -341,7 +341,7 @@ let locale: Record<string, string> = {
   showBackgroundImg: 'Show background image',
   showBraveStats: 'Show Brave Stats',
   showBinance: 'Show Binance',
-  togetherWidgetTitle: 'Brave Talk',
+  braveTalkWidgetTitle: 'Brave Talk',
   showClock: 'Show Clock',
   showTopSites: 'Show Top Sites',
   showRewards: 'Show Rewards',

diff --git a/browser/brave_profile_prefs.cc b/browser/brave_profile_prefs.cc
@@ -305,7 +305,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
       brave_today_enabled_default);
   registry->RegisterBooleanPref(kNewTabPageShowRewards, true);
   registry->RegisterBooleanPref(kNewTabPageShowBinance, true);
-  registry->RegisterBooleanPref(kNewTabPageShowTogether, false);
+  registry->RegisterBooleanPref(kNewTabPageShowBraveTalk, false);
   registry->RegisterBooleanPref(kNewTabPageShowGemini, true);
   registry->RegisterBooleanPref(kNewTabPageHideAllWidgets, false);
 

diff --git a/browser/extensions/api/brave_talk_api.cc b/browser/extensions/api/brave_talk_api.cc
@@ -17,15 +17,15 @@ namespace extensions {
 namespace api {
 
 ExtensionFunction::ResponseAction
-BraveTogetherIsSupportedFunction::Run() {
+BraveTalkIsSupportedFunction::Run() {
   Profile* profile = Profile::FromBrowserContext(browser_context());
 
   if (profile->IsTor()) {
     return RespondNow(Error("Not available in Tor profile"));
   }
 
   bool is_supported = ntp_widget_utils::IsRegionSupported(
-      profile->GetPrefs(), brave_together::unsupported_regions, false);
+      profile->GetPrefs(), brave_talk::unsupported_regions, false);
   return RespondNow(OneArgument(base::Value(is_supported)));
 }
 

diff --git a/browser/extensions/api/brave_talk_api.h b/browser/extensions/api/brave_talk_api.h
@@ -16,13 +16,13 @@ class Profile;
 namespace extensions {
 namespace api {
 
-class BraveTogetherIsSupportedFunction :
+class BraveTalkIsSupportedFunction :
     public ExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("braveTogether.isSupported", UNKNOWN)
+  DECLARE_EXTENSION_FUNCTION("braveTalk.isSupported", UNKNOWN)
 
  protected:
-  ~BraveTogetherIsSupportedFunction() override {}
+  ~BraveTalkIsSupportedFunction() override {}
   ResponseAction Run() override;
 };
 

diff --git a/browser/extensions/api/settings_private/brave_prefs_util.cc b/browser/extensions/api/settings_private/brave_prefs_util.cc
@@ -148,7 +148,7 @@ const PrefsUtil::TypedPrefMap& BravePrefsUtil::GetAllowlistedKeys() {
       settings_api::PrefType::PREF_TYPE_BOOLEAN;
   (*s_brave_allowlist)[kNewTabPageShowBinance] =
       settings_api::PrefType::PREF_TYPE_BOOLEAN;
-  (*s_brave_allowlist)[kNewTabPageShowTogether] =
+  (*s_brave_allowlist)[kNewTabPageShowBraveTalk] =
       settings_api::PrefType::PREF_TYPE_BOOLEAN;
   (*s_brave_allowlist)[kNewTabPageShowGemini] =
       settings_api::PrefType::PREF_TYPE_BOOLEAN;

diff --git a/browser/search/ntp_utils.cc b/browser/search/ntp_utils.cc
@@ -27,7 +27,7 @@ void ClearNewTabPageProfilePrefs(Profile* profile) {
 
 const char* const kWidgetPrefNames[] = {
   kNewTabPageShowRewards,
-  kNewTabPageShowTogether,
+  kNewTabPageShowBraveTalk,
   kNewTabPageShowBinance,
 #if BUILDFLAG(CRYPTO_DOT_COM_ENABLED)
   kCryptoDotComNewTabPageShowCryptoDotCom,
@@ -82,7 +82,7 @@ void MigrateNewTabPagePrefs(Profile* profile) {
       // take effect, whereby each widget's show/hide setting is remembered
       // individually.
       prefs->SetBoolean(kNewTabPageShowRewards, true);
-      prefs->SetBoolean(kNewTabPageShowTogether, true);
+      prefs->SetBoolean(kNewTabPageShowBraveTalk, true);
       prefs->SetBoolean(kNewTabPageShowBinance, true);
     #if BUILDFLAG(CRYPTO_DOT_COM_ENABLED)
       prefs->SetBoolean(kCryptoDotComNewTabPageShowCryptoDotCom, true);

diff --git a/browser/search/ntp_utils_unittest.cc b/browser/search/ntp_utils_unittest.cc
@@ -41,7 +41,7 @@ TEST_F(NTPUtilsTest, MigratesHideWidgetTrue) {
   // Manually turn all off
   auto* prefs = profile()->GetPrefs();
   prefs->SetBoolean(kNewTabPageShowRewards, false);
-  prefs->SetBoolean(kNewTabPageShowTogether, false);
+  prefs->SetBoolean(kNewTabPageShowBraveTalk, false);
   prefs->SetBoolean(kNewTabPageShowBinance, false);
 #if BUILDFLAG(CRYPTO_DOT_COM_ENABLED)
   prefs->SetBoolean(kCryptoDotComNewTabPageShowCryptoDotCom, false);
@@ -57,7 +57,7 @@ TEST_F(NTPUtilsTest, MigratesHideWidgetFalse) {
   // Manually turn some off
   auto* prefs = profile()->GetPrefs();
   prefs->SetBoolean(kNewTabPageShowRewards, false);
-  prefs->SetBoolean(kNewTabPageShowTogether, true);
+  prefs->SetBoolean(kNewTabPageShowBraveTalk, true);
   prefs->SetBoolean(kNewTabPageShowBinance, false);
 #if BUILDFLAG(CRYPTO_DOT_COM_ENABLED)
   prefs->SetBoolean(kCryptoDotComNewTabPageShowCryptoDotCom, false);

diff --git a/browser/ui/webui/brave_webui_source.cc b/browser/ui/webui/brave_webui_source.cc
@@ -244,10 +244,10 @@ void CustomizeWebUIHTMLSource(const std::string &name,
         { "torStatusInitializing", IDS_BRAVE_PRIVATE_NEW_TAB_TOR_STATUS_INITIALIZING },   // NOLINT
         { "torTip", IDS_BRAVE_PRIVATE_NEW_TAB_TOR_TIP},
 
-        // Together prompt
-        { "togetherPromptTitle", IDS_BRAVE_TOGETHER_PROMPT_TITLE },
-        { "togetherPromptDescription", IDS_BRAVE_TOGETHER_PROMPT_DESCRIPTION },
-        { "togetherPromptAction", IDS_BRAVE_TOGETHER_PROMPT_ACTION },
+        // Brave Talk prompt
+        { "braveTalkPromptTitle", IDS_BRAVE_TALK_PROMPT_TITLE },
+        { "braveTalkPromptDescription", IDS_BRAVE_TALK_PROMPT_DESCRIPTION },
+        { "braveTalkPromptAction", IDS_BRAVE_TALK_PROMPT_ACTION },
 
         // Rewards widget
         { "rewardsWidgetBat", IDS_BRAVE_UI_BAT_REWARDS_TEXT },
@@ -273,11 +273,11 @@ void CustomizeWebUIHTMLSource(const std::string &name,
         { "tosAndPp", IDS_REWARDS_WIDGET_TOS_AND_PP},     // NOLINT
         { "rewardsWidgetStartUsing", IDS_REWARDS_WIDGET_START_USING},     // NOLINT
         { "pendingRewardsMessage", IDS_BRAVE_REWARDS_PENDING_REWARDS_MESSAGE },
-        // Together Widget
-        { "togetherWidgetTitle", IDS_TOGETHER_WIDGET_TITLE },
-        { "togetherWidgetWelcomeTitle", IDS_TOGETHER_WIDGET_WELCOME_TITLE },
-        { "togetherWidgetStartButton", IDS_TOGETHER_WIDGET_START_BUTTON },
-        { "togetherWidgetAboutData", IDS_TOGETHER_WIDGET_ABOUT_DATA },
+        // Brave Talk  Widget
+        { "braveTalkWidgetTitle", IDS_BRAVE_TALK_WIDGET_TITLE },
+        { "braveTalkWidgetWelcomeTitle", IDS_BRAVE_TALK_WIDGET_WELCOME_TITLE },
+        { "braveTalkWidgetStartButton", IDS_BRAVE_TALK_WIDGET_START_BUTTON },
+        { "braveTalkWidgetAboutData", IDS_BRAVE_TALK_WIDGET_ABOUT_DATA },
         // Binance Widget
         { "binanceWidgetBuy", IDS_BINANCE_WIDGET_BUY },
         { "binanceWidgetBuyCrypto", IDS_BINANCE_WIDGET_BUY_CRYPTO },

diff --git a/browser/ui/webui/new_tab_page/brave_new_tab_message_handler.cc b/browser/ui/webui/new_tab_page/brave_new_tab_message_handler.cc
@@ -120,8 +120,8 @@ base::DictionaryValue GetPreferencesDictionary(PrefService* prefs) {
       "showBinance",
       prefs->GetBoolean(kNewTabPageShowBinance));
   pref_data.SetBoolean(
-      "showTogether",
-      prefs->GetBoolean(kNewTabPageShowTogether));
+      "showBraveTalk",
+      prefs->GetBoolean(kNewTabPageShowBraveTalk));
   pref_data.SetBoolean(
       "showGemini",
       prefs->GetBoolean(kNewTabPageShowGemini));
@@ -393,7 +393,7 @@ void BraveNewTabMessageHandler::OnJavascriptAllowed() {
       base::BindRepeating(&BraveNewTabMessageHandler::OnPreferencesChanged,
                           base::Unretained(this)));
   pref_change_registrar_.Add(
-      kNewTabPageShowTogether,
+      kNewTabPageShowBraveTalk,
       base::BindRepeating(&BraveNewTabMessageHandler::OnPreferencesChanged,
                           base::Unretained(this)));
   pref_change_registrar_.Add(
@@ -528,8 +528,8 @@ void BraveNewTabMessageHandler::HandleSaveNewTabPagePref(
     settingsKey = kNewTabPageHideAllWidgets;
   } else if (settingsKeyInput == "showBinance") {
     settingsKey = kNewTabPageShowBinance;
-  } else if (settingsKeyInput == "showTogether") {
-    settingsKey = kNewTabPageShowTogether;
+  } else if (settingsKeyInput == "showBraveTalk") {
+    settingsKey = kNewTabPageShowBraveTalk;
   } else if (settingsKeyInput == "showGemini") {
     settingsKey = kNewTabPageShowGemini;
 #if BUILDFLAG(CRYPTO_DOT_COM_ENABLED)

diff --git a/common/extensions/api/BUILD.gn b/common/extensions/api/BUILD.gn
@@ -14,7 +14,7 @@ json_features("api_features") {
     "//chrome/common/extensions/api/_api_features.json",
     "//extensions/common/api/_api_features.json",
     "_api_features.json",
-    "_brave_together_api_features.json",
+    "_brave_talk_api_features.json",
   ]
 
   if (ethereum_remote_client_enabled) {
@@ -75,7 +75,7 @@ brave_extensions_api_schema_sources = [
   "brave_today.json",
   "greaselion.json",
   "rewards_notifications.json",
-  "brave_together.json",
+  "brave_talk.json",
 ]
 
 if (ipfs_enabled) {

diff --git a/...ons/api/_brave_together_api_features.json → ...ensions/api/_brave_talk_api_features.json b/...ons/api/_brave_together_api_features.json → ...ensions/api/_brave_talk_api_features.json
@@ -3,7 +3,7 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 {
-  "braveTogether": {
+  "braveTalk": {
     "channel": "stable",
     "contexts": ["webui"],
     "dependencies": [],

diff --git a/common/extensions/api/brave_together.json → common/extensions/api/brave_talk.json b/common/extensions/api/brave_together.json → common/extensions/api/brave_talk.json
@@ -4,8 +4,8 @@
 
 [
   {
-    "namespace": "braveTogether",
-    "description": "Use the <code>chrome.braveTogether</code> API to to receive info pertaining to the Brave Talk feature.",
+    "namespace": "braveTalk",
+    "description": "Use the <code>chrome.braveTalk</code> API to to receive info pertaining to the Brave Talk feature.",
     "compiler_options": {
       "implemented_in": "brave/browser/extensions/api/brave_talk_api.h"
     },

diff --git a/common/pref_names.cc b/common/pref_names.cc
@@ -60,7 +60,7 @@ const char kNewTabPageShowToday[] = "brave.new_tab_page.show_brave_today";
 const char kNewTabPageShowRewards[] = "brave.new_tab_page.show_rewards";
 const char kNewTabPageShowBinance[] = "brave.new_tab_page.show_binance";
 const char kNewTabPageShowGemini[] = "brave.new_tab_page.show_gemini";
-const char kNewTabPageShowTogether[] = "brave.new_tab_page.show_together";
+const char kNewTabPageShowBraveTalk[] = "brave.new_tab_page.show_together";
 const char kNewTabPageHideAllWidgets[] = "brave.new_tab_page.hide_all_widgets";
 const char kNewTabPageShowsOptions[] = "brave.new_tab_page.shows_options";
 const char kBraveTodaySources[] = "brave.today.sources";

diff --git a/common/pref_names.h b/common/pref_names.h
@@ -52,7 +52,7 @@ extern const char kNewTabPageShowToday[];
 extern const char kNewTabPageShowRewards[];
 extern const char kNewTabPageShowBinance[];
 extern const char kNewTabPageShowGemini[];
-extern const char kNewTabPageShowTogether[];
+extern const char kNewTabPageShowBraveTalk[];
 extern const char kNewTabPageHideAllWidgets[];
 extern const char kNewTabPageShowsOptions[];
 // TODO(petemill): Move to brave_today component

diff --git a/components/brave_new_tab_ui/actions/new_tab_actions.ts b/components/brave_new_tab_ui/actions/new_tab_actions.ts
@@ -20,7 +20,7 @@ export const statsUpdated = (stats: Stats) =>
 
 export const init = createAction<void>('page init')
 
-export const dismissTogetherPrompt = createAction('dismiss together prompt')
+export const dismissBraveTalkPrompt = createAction('dismiss brave talk prompt')
 
 export const privateTabDataUpdated = (data: PrivateTabData) =>
   action(types.NEW_TAB_PRIVATE_TAB_DATA_UPDATED, data)

diff --git a/components/brave_new_tab_ui/api/initialData.ts b/components/brave_new_tab_ui/api/initialData.ts
@@ -15,7 +15,7 @@ export type InitialData = {
   privateTabData: privateTabDataAPI.PrivateTabData
   torTabData: torTabDataAPI.TorTabData
   brandedWallpaperData: undefined | NewTab.BrandedWallpaper
-  togetherSupported: boolean
+  braveTalkSupported: boolean
   geminiSupported: boolean
   binanceSupported: boolean
   cryptoDotComSupported: boolean
@@ -46,7 +46,7 @@ export async function getInitialData (): Promise<InitialData> {
       privateTabData,
       torTabData,
       brandedWallpaperData,
-      togetherSupported,
+      braveTalkSupported,
       geminiSupported,
       cryptoDotComSupported,
       ftxSupported,
@@ -58,12 +58,12 @@ export async function getInitialData (): Promise<InitialData> {
       torTabDataAPI.getTorTabData(),
       !isIncognito ? brandedWallpaper.getBrandedWallpaper() : Promise.resolve(undefined),
       new Promise((resolve) => {
-        if (!('braveTogether' in chrome)) {
+        if (!('braveTalk' in chrome)) {
           resolve(false)
           return
         }
 
-        chrome.braveTogether.isSupported((supported: boolean) => {
+        chrome.braveTalk.isSupported((supported: boolean) => {
           resolve(supported)
         })
       }),
@@ -95,7 +95,7 @@ export async function getInitialData (): Promise<InitialData> {
       privateTabData,
       torTabData,
       brandedWallpaperData,
-      togetherSupported,
+      braveTalkSupported,
       geminiSupported,
       cryptoDotComSupported,
       ftxSupported,

diff --git a/components/brave_new_tab_ui/api/preferences.ts b/components/brave_new_tab_ui/api/preferences.ts
@@ -46,8 +46,8 @@ export function saveShowRewards (value: boolean): void {
   sendSavePref('showRewards', value)
 }
 
-export function saveShowTogether (value: boolean): void {
-  sendSavePref('showTogether', value)
+export function saveShowBraveTalk (value: boolean): void {
+  sendSavePref('showBraveTalk', value)
 }
 
 export function saveShowBinance (value: boolean): void {

diff --git a/components/brave_new_tab_ui/components/default/braveTalk/assets/brave-talk-svg.tsx b/components/brave_new_tab_ui/components/default/braveTalk/assets/brave-talk-svg.tsx
@@ -5,7 +5,7 @@
 
 import * as React from 'react'
 
-export default class BraveTogetherIcon extends React.PureComponent {
+export default class BraveTalkSvg extends React.PureComponent {
 
   render () {
     return (

diff --git a/components/brave_new_tab_ui/components/default/braveTalk/index.tsx b/components/brave_new_tab_ui/components/default/braveTalk/index.tsx
@@ -13,13 +13,13 @@ import {
   WelcomeText,
   ActionsWrapper,
   CallButton,
-  TogetherIcon,
+  BraveTalkIcon,
   StyledTitle,
   Privacy,
   PrivacyLink
 } from './style'
 import { StyledTitleTab } from '../widgetTitleTab'
-import BraveTogetherIcon from './assets/brave-talk-svg'
+import BraveTalkSvg from './assets/brave-talk-svg'
 import { braveTalkWidgetUrl } from '../../../constants/new_tab_ui'
 
 interface Props {
@@ -28,21 +28,21 @@ interface Props {
   onShowContent: () => void
 }
 
-class Together extends React.PureComponent<Props, {}> {
+class BraveTalk extends React.PureComponent<Props, {}> {
 
   getButtonText = () => {
-    return getLocale('togetherWidgetStartButton')
+    return getLocale('braveTalkWidgetStartButton')
   }
 
   renderTitle () {
     return (
       <Header>
         <StyledTitle>
-          <TogetherIcon>
-            <BraveTogetherIcon />
-          </TogetherIcon>
+          <BraveTalkIcon>
+            <BraveTalkSvg />
+          </BraveTalkIcon>
           <>
-            {getLocale('togetherWidgetTitle')}
+            {getLocale('braveTalkWidgetTitle')}
           </>
         </StyledTitle>
       </Header>
@@ -78,19 +78,19 @@ class Together extends React.PureComponent<Props, {}> {
           {this.renderTitle()}
           <Content>
             <WelcomeText>
-              {getLocale('togetherWidgetWelcomeTitle')}
+              {getLocale('braveTalkWidgetWelcomeTitle')}
             </WelcomeText>
             <ActionsWrapper>
               <CallButton onClick={this.shouldCreateCall}>
-                {getLocale('togetherWidgetStartButton')}
+                {getLocale('braveTalkWidgetStartButton')}
               </CallButton>
               <Privacy>
                 <PrivacyLink
                   rel={'noopener'}
                   target={'_blank'}
                   href={'https://brave.com/privacy/#brave-together-learn'}
                 >
-                  {getLocale('togetherWidgetAboutData')}
+                  {getLocale('braveTalkWidgetAboutData')}
                 </PrivacyLink>
               </Privacy>
             </ActionsWrapper>
@@ -100,4 +100,4 @@ class Together extends React.PureComponent<Props, {}> {
   }
 }
 
-export const TogetherWidget = createWidget(Together)
+export const BraveTalkWidget = createWidget(BraveTalk)
diff --git a/components/brave_new_tab_ui/components/default/braveTalk/style.tsx b/components/brave_new_tab_ui/components/default/braveTalk/style.tsx
@@ -60,7 +60,7 @@ export const CallButton = styled('button')<{}>`
   }
 `
 
-export const TogetherIcon = styled('div')<{}>`
+export const BraveTalkIcon = styled('div')<{}>`
   width: 24px;
   height: 24px;
   margin-right: 7px;