Rename instances of together

Originally done as separate commits (one at a time) and compiled/tested after each.

Fixes brave/brave-browser#17138

- 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`

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);
 

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;

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);

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);

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)

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";

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

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)

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,
@@ -95,7 +95,7 @@ export async function getInitialData (): Promise<InitialData> {
       privateTabData,
       torTabData,
       brandedWallpaperData,
-      togetherSupported,
+      braveTalkSupported,
       geminiSupported,
       cryptoDotComSupported,
       ftxSupported,

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 {

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 (

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,7 +28,7 @@ interface Props {
   onShowContent: () => void
 }
 
-class Together extends React.PureComponent<Props, {}> {
+class BraveTalk extends React.PureComponent<Props, {}> {
 
   getButtonText = () => {
     return getLocale('braveTalkWidgetStartButton')
@@ -38,9 +38,9 @@ class Together extends React.PureComponent<Props, {}> {
     return (
       <Header>
         <StyledTitle>
-          <TogetherIcon>
-            <BraveTogetherIcon />
-          </TogetherIcon>
+          <BraveTalkIcon>
+            <BraveTalkSvg />
+          </BraveTalkIcon>
           <>
             {getLocale('braveTalkWidgetTitle')}
           </>
@@ -100,4 +100,4 @@ class Together extends React.PureComponent<Props, {}> {
   }
 }
 
-export const TogetherWidget = createWidget(Together)
+export const BraveTalkWidget = createWidget(BraveTalk)

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;

components/brave_new_tab_ui/components/default/footer/braveTalkTooltip/index.tsx

@@ -5,7 +5,7 @@
 
 import * as React from 'react'
 import { getLocale } from '../../../../../common/locale'
-import TogetherIcon from './braveTalkIcon'
+import BraveTalkIcon from './braveTalkIcon'
 import CloseIcon from './closeIcon'
 import { LinkButton } from '../../../outlineButton'
 import * as S from './style'
@@ -15,12 +15,12 @@ type Props = {
   onClose: () => any
 }
 
-const TogetherTooltip: React.FunctionComponent<Props> = function (props) {
+const BraveTalkTooltip: React.FunctionComponent<Props> = function (props) {
   return (
     <S.Anchor>
       <S.Tooltip>
         <S.Title>
-          <S.TitleIcon><TogetherIcon /></S.TitleIcon>
+          <S.TitleIcon><BraveTalkIcon /></S.TitleIcon>
           {getLocale('braveTalkPromptTitle')}
         </S.Title>
         <S.Body>
@@ -41,4 +41,4 @@ const TogetherTooltip: React.FunctionComponent<Props> = function (props) {
   )
 }
 
-export default TogetherTooltip
+export default BraveTalkTooltip

components/brave_new_tab_ui/components/default/footer/footer.tsx

@@ -24,36 +24,36 @@ import {
   BookmarkBook,
   HistoryIcon
 } from 'brave-ui/components/icons'
-import TogetherTooltip from './braveTalkTooltip'
-import TogetherIcon from './braveTalkTooltip/braveTalkIcon'
+import BraveTalkTooltip from './braveTalkTooltip'
+import BraveTalkIcon from './braveTalkTooltip/braveTalkIcon'
 
 // Helpers
 import { getLocale } from '../../../../common/locale'
 
 interface Props {
   textDirection: string
-  supportsTogether: boolean
-  togetherPromptDismissed: boolean
+  supportsBraveTalk: boolean
+  braveTalkPromptDismissed: boolean
   backgroundImageInfo: any
   showPhotoInfo: boolean
   onClickSettings: () => any
-  onDismissTogetherPrompt: () => any
+  onDismissBraveTalkPrompt: () => any
 }
 
-function TogetherItem (props: Props) {
-  if (!props.togetherPromptDismissed) {
+function BraveTalkItem (props: Props) {
+  if (!props.braveTalkPromptDismissed) {
     return (
-      <TogetherTooltip onClose={props.onDismissTogetherPrompt}>
+      <BraveTalkTooltip onClose={props.onDismissBraveTalkPrompt}>
         <IconLink title={getLocale('braveTalkPromptTitle')} href='https://talk.brave.com/widget'>
-          <TogetherIcon />
+          <BraveTalkIcon />
         </IconLink>
-      </TogetherTooltip>
+      </BraveTalkTooltip>
     )
   }
 
   return (
     <IconLink title={getLocale('braveTalkPromptTitle')} href='https://talk.brave.com/widget'>
-      <TogetherIcon />
+      <BraveTalkIcon />
     </IconLink>
   )
 }
@@ -62,7 +62,7 @@ export default class FooterInfo extends React.PureComponent<Props, {}> {
   render () {
     const {
       textDirection,
-      supportsTogether,
+      supportsBraveTalk,
       backgroundImageInfo,
       showPhotoInfo,
       onClickSettings
@@ -102,8 +102,8 @@ export default class FooterInfo extends React.PureComponent<Props, {}> {
             <IconLink title={getLocale('historyPageTitle')} href='chrome://history'>
               <HistoryIcon />
             </IconLink>
-            {supportsTogether &&
-              <TogetherItem {...this.props} />
+            {supportsBraveTalk &&
+              <BraveTalkItem {...this.props} />
             }
           </Navigation>
         </S.GridItemNavigation>

components/brave_new_tab_ui/components/default/index.ts

@@ -10,7 +10,7 @@ import { SiteRemovalNotification, SiteRemovalText, SiteRemovalAction } from './n
 import { ClockWidget } from './clock'
 import { RewardsWidget } from './rewards'
 import { BinanceWidget } from './binance'
-import { TogetherWidget } from './braveTalk'
+import { BraveTalkWidget } from './braveTalk'
 import { GeminiWidget } from './gemini'
 import { CryptoDotComWidget } from './cryptoDotCom'
 import EditCards from './editCards'
@@ -37,7 +37,7 @@ export {
   ClockWidget,
   RewardsWidget,
   BinanceWidget,
-  TogetherWidget,
+  BraveTalkWidget,
   EditCards,
   GeminiWidget,
   CryptoDotComWidget,

components/brave_new_tab_ui/components/default/page/index.tsx

@@ -31,7 +31,7 @@ type PageProps = {
   showStats: boolean
   showRewards: boolean
   showBinance: boolean
-  showTogether: boolean
+  showBraveTalk: boolean
   showTopSites: boolean
   showBrandedWallpaper: boolean
 } & HasImageProps

components/brave_new_tab_ui/containers/app.tsx

@@ -59,7 +59,7 @@ function DefaultPage (props: Props) {
         saveShowStats={PreferencesAPI.saveShowStats}
         saveShowToday={PreferencesAPI.saveShowToday}
         saveShowRewards={PreferencesAPI.saveShowRewards}
-        saveShowTogether={PreferencesAPI.saveShowTogether}
+        saveShowBraveTalk={PreferencesAPI.saveShowBraveTalk}
         saveShowBinance={PreferencesAPI.saveShowBinance}
         saveShowGemini={PreferencesAPI.saveShowGemini}
         saveShowCryptoDotCom={PreferencesAPI.saveShowCryptoDotCom}