chromium/src
0
Fork 0
Code Activity

[lobster] Migrate strings from ash_internal_strings

Browse Source 
Bug: b:376383722
Change-Id: Id3dfcbfd6971729a5ef147e929e62c681366bfd7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6301575
Reviewed-by: Andre Le <leandre@chromium.org>
Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org>
Reviewed-by: Darren Shen <shend@chromium.org>
Reviewed-by: Chuong Ho <hdchuong@chromium.org>
Reviewed-by: John Palmer <jopalmer@chromium.org>
Commit-Queue: Grey Wang <greywang@google.com>
Cr-Commit-Position: refs/heads/main@{#1426100}
This commit is contained in:
Grey Wang
2025-02-27 18:40:57 -08:00
committed by Chromium LUCI CQ
parent 8396c0ba90
commit cc845589a4
29 changed files with 112 additions and 126 deletions
ash
ash_strings.grd
ash_strings_grd
IDS_LOBSTER_COPY_IMAGE_TO_CLIPBOARD_TOAST_MESSAGE.png.sha1IDS_LOBSTER_FAILED_IMAGE_DOWNLOAD_NOTIFICATION_MESSAGE.png.sha1IDS_LOBSTER_FAILED_IMAGE_DOWNLOAD_NOTIFICATION_TITLE.png.sha1IDS_LOBSTER_IMAGE_DOWNLOAD_NOTIFICATION_SOURCE.png.sha1IDS_LOBSTER_IMAGE_INSERTION_ANNOUNCEMENT_FAILURE.png.sha1IDS_LOBSTER_IMAGE_INSERTION_ANNOUNCEMENT_SUCCESS.png.sha1IDS_LOBSTER_MAGIC_BOOST_DISCLAIMER_PARAGRAPH_FOUR.png.sha1IDS_LOBSTER_MAGIC_BOOST_DISCLAIMER_PARAGRAPH_ONE.png.sha1IDS_LOBSTER_MAGIC_BOOST_DISCLAIMER_PARAGRAPH_THREE.png.sha1IDS_LOBSTER_MAGIC_BOOST_DISCLAIMER_PARAGRAPH_TWO.png.sha1IDS_LOBSTER_SELECTION_LABEL.png.sha1IDS_LOBSTER_SUCCESSFUL_IMAGE_DOWNLOAD_NOTIFICATION_COPY_IMAGE_TO_CLIPBOARD_ACTION_LABEL.png.sha1IDS_LOBSTER_SUCCESSFUL_IMAGE_DOWNLOAD_NOTIFICATION_SHOW_IN_FOLDER_ACTION_LABEL.png.sha1IDS_LOBSTER_SUCCESSFUL_IMAGE_DOWNLOAD_NOTIFICATION_TITLE.png.sha1
lobster
lobster_image_insert_or_copy_actuator.cclobster_session_impl.cc
quick_insert
views
quick_insert_strings.ccquick_insert_zero_state_view_unittest.cc
system
magic_boost
magic_boost_disclaimer_view.cc
chrome
app
os_settings_strings.grdp
os_settings_strings_grdp
IDS_LOBSTER_OS_SETTINGS_ENABLE.png.sha1IDS_LOBSTER_OS_SETTINGS_ENABLE_DESCRIPTION.png.sha1
browser
ui
ash
editor_menu
editor_menu_strings.cc
webui
ash
settings
pages
search
search_section.cc
chromeos
chromeos_strings.grd
chromeos_strings_grd
IDS_LOBSTER_EDITOR_MENU_CARD_CHIP_LABEL.png.sha1IDS_LOBSTER_EDITOR_MENU_CARD_FREEFORM_PLACEHOLDER.png.sha1IDS_LOBSTER_EDITOR_MENU_CARD_TAB_LABEL.png.sha1

44
ash/ash_strings.grd

@ -7912,6 +7912,50 @@ New install
Featured GIFs
</message>
<!-- Lobster -->
<message name="IDS_LOBSTER_SELECTION_LABEL" desc="The label for the option to open Image Generation.">
Create image
</message>
<message name="IDS_LOBSTER_COPY_IMAGE_TO_CLIPBOARD_TOAST_MESSAGE" desc="The toast message displayed when the image from Image Generation is copied into the clipboard history.">
Copied to clipboard.
</message>
<message name="IDS_LOBSTER_IMAGE_DOWNLOAD_NOTIFICATION_SOURCE" desc="The source label of the successful image download notification of Image Generation.">
Download manager
</message>
<message name="IDS_LOBSTER_IMAGE_INSERTION_ANNOUNCEMENT_SUCCESS" desc="The announcement made when users insert image successfully from Image Generation.">
Image inserted
</message>
<message name="IDS_LOBSTER_IMAGE_INSERTION_ANNOUNCEMENT_FAILURE" desc="The announcement made when users failed to insert image from Image Generation">
Image insertion failed
</message>
<message name="IDS_LOBSTER_SUCCESSFUL_IMAGE_DOWNLOAD_NOTIFICATION_TITLE" desc="The title of the successful image download notification of Image Generation.">
Download complete
</message>
<message name="IDS_LOBSTER_FAILED_IMAGE_DOWNLOAD_NOTIFICATION_TITLE" desc="The title of the unsuccessful image download notification of Image Generation.">
<ph name="FILE_NAME">$1<ex>somedocument.pdf</ex></ph> download unsuccessful.
</message>
<message name="IDS_LOBSTER_FAILED_IMAGE_DOWNLOAD_NOTIFICATION_MESSAGE" desc="The message of the unsuccessful image download notification of Image Generation.">
Failed
</message>
<message name="IDS_LOBSTER_SUCCESSFUL_IMAGE_DOWNLOAD_NOTIFICATION_SHOW_IN_FOLDER_ACTION_LABEL" desc="The label of the button in successful image download notification of Image Generation. Clicking the button will open the Downloads folder.">
Show in folder
</message>
<message name="IDS_LOBSTER_SUCCESSFUL_IMAGE_DOWNLOAD_NOTIFICATION_COPY_IMAGE_TO_CLIPBOARD_ACTION_LABEL" desc="The label of the button in successful image download notification of Image Generation. Clicking the button will copy the image into the clipboard history.">
Copy to clipboard
</message>
<message name="IDS_LOBSTER_MAGIC_BOOST_DISCLAIMER_PARAGRAPH_ONE" desc="Text shown as the first paragraph of the Magic Boost with Image Generation disclaimer view's body.">
You must be at least 18 years old to use Help me read, Help me write, and create images with AI.
</message>
<message name="IDS_LOBSTER_MAGIC_BOOST_DISCLAIMER_PARAGRAPH_TWO" desc="Text shown as the second paragraph of the Magic Boost with Image Generation disclaimer view's body.">
When you turn on these features, the input text, document content, and web page URL may be sent to Google servers. This information is used to generate writing suggestions, generate summaries, answer questions, and improve the product, subject to <ph name="LINK_TO_SERVICE_TERMS">$1<ex>Google's Terms of Service and Privacy Policy</ex></ph>. Don't include anything personal, sensitive, or confidential.
</message>
<message name="IDS_LOBSTER_MAGIC_BOOST_DISCLAIMER_PARAGRAPH_THREE" desc="Text shown as the third paragraph of the Magic Boost with Image Generation disclaimer view's body.">
Generative AI can make mistakes, including about people, so double-check it.
</message>
<message name="IDS_LOBSTER_MAGIC_BOOST_DISCLAIMER_PARAGRAPH_FOUR" desc="Text shown as the forth paragraph of the Magic Boost with Image Generation disclaimer view's body.">
You can turn off these features at any time in Settings. <ph name="LINK_TO_LEARN_MORE">$1<ex>Learn more</ex></ph>
</message>
<!-- WM -->
<message name="IDS_ENTER_PIP_A11Y_NOTIFICATION" is_accessibility_with_no_ui="true" desc="Accessibility text read by chromevox when a window starts picture-in-picture mode.">
Picture-in-picture started, Alt+Shift+V to focus

1
ash/ash_strings_grd/IDS_LOBSTER_COPY_IMAGE_TO_CLIPBOARD_TOAST_MESSAGE.png.sha1 Normal file

@ -0,0 +1 @@
d165a702a47cadbcad0842336d868752e0d02c98

1
ash/ash_strings_grd/IDS_LOBSTER_FAILED_IMAGE_DOWNLOAD_NOTIFICATION_MESSAGE.png.sha1 Normal file

@ -0,0 +1 @@
496c225d847cd0c68f4bc625afc6c23c62185a5c

1
ash/ash_strings_grd/IDS_LOBSTER_FAILED_IMAGE_DOWNLOAD_NOTIFICATION_TITLE.png.sha1 Normal file

@ -0,0 +1 @@
496c225d847cd0c68f4bc625afc6c23c62185a5c

1
ash/ash_strings_grd/IDS_LOBSTER_IMAGE_DOWNLOAD_NOTIFICATION_SOURCE.png.sha1 Normal file

@ -0,0 +1 @@
82a52bae946a27fc221539854ae5a6d46eff70bc

1
ash/ash_strings_grd/IDS_LOBSTER_IMAGE_INSERTION_ANNOUNCEMENT_FAILURE.png.sha1 Normal file

@ -0,0 +1 @@
4a1056c02f346b1bf4f6aa083331cfd502e0adf2

1
ash/ash_strings_grd/IDS_LOBSTER_IMAGE_INSERTION_ANNOUNCEMENT_SUCCESS.png.sha1 Normal file

@ -0,0 +1 @@
eec776718969a61856183f9459f3e62bdd35d85c

1
ash/ash_strings_grd/IDS_LOBSTER_MAGIC_BOOST_DISCLAIMER_PARAGRAPH_FOUR.png.sha1 Normal file

@ -0,0 +1 @@
240e2edd4e5ca45ceea60e7f17094e17a302f010

1
ash/ash_strings_grd/IDS_LOBSTER_MAGIC_BOOST_DISCLAIMER_PARAGRAPH_ONE.png.sha1 Normal file

@ -0,0 +1 @@
240e2edd4e5ca45ceea60e7f17094e17a302f010

1
ash/ash_strings_grd/IDS_LOBSTER_MAGIC_BOOST_DISCLAIMER_PARAGRAPH_THREE.png.sha1 Normal file

@ -0,0 +1 @@
240e2edd4e5ca45ceea60e7f17094e17a302f010

1
ash/ash_strings_grd/IDS_LOBSTER_MAGIC_BOOST_DISCLAIMER_PARAGRAPH_TWO.png.sha1 Normal file

@ -0,0 +1 @@
240e2edd4e5ca45ceea60e7f17094e17a302f010

1
ash/ash_strings_grd/IDS_LOBSTER_SELECTION_LABEL.png.sha1 Normal file

@ -0,0 +1 @@
2da1dbd5c49a5e7854cd96b867f92b2b8af5111a

1
ash/ash_strings_grd/IDS_LOBSTER_SUCCESSFUL_IMAGE_DOWNLOAD_NOTIFICATION_COPY_IMAGE_TO_CLIPBOARD_ACTION_LABEL.png.sha1 Normal file

@ -0,0 +1 @@
82a52bae946a27fc221539854ae5a6d46eff70bc

1
ash/ash_strings_grd/IDS_LOBSTER_SUCCESSFUL_IMAGE_DOWNLOAD_NOTIFICATION_SHOW_IN_FOLDER_ACTION_LABEL.png.sha1 Normal file

@ -0,0 +1 @@
82a52bae946a27fc221539854ae5a6d46eff70bc

1
ash/ash_strings_grd/IDS_LOBSTER_SUCCESSFUL_IMAGE_DOWNLOAD_NOTIFICATION_TITLE.png.sha1 Normal file

@ -0,0 +1 @@
82a52bae946a27fc221539854ae5a6d46eff70bc

18
ash/lobster/lobster_image_insert_or_copy_actuator.cc

@ -7,6 +7,7 @@
#include "ash/constants/notifier_catalogs.h"
#include "ash/public/cpp/system/toast_data.h"
#include "ash/public/cpp/system/toast_manager.h"
#include "ash/strings/grit/ash_strings.h"
#include "base/base64.h"
#include "base/containers/span.h"
#include "base/strings/strcat.h"
@ -18,10 +19,6 @@
#include "ui/base/l10n/l10n_util.h"
#include "url/gurl.h"
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
#include "chromeos/ash/resources/internal/strings/grit/ash_internal_strings.h"
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
namespace ash {
namespace {
@ -66,15 +63,10 @@ bool InsertImageOrCopyToClipboard(ui::TextInputClient* input_client,
CopyToClipboard(image_bytes);
// Display a toast message.
ToastManager::Get()->Show(ToastData(
kLobsterToastId, ToastCatalogName::kCopyImageToClipboardAction,
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
l10n_util::GetStringUTF16(
IDS_ASH_LOBSTER_COPY_IMAGE_TO_CLIPBOARD_TOAST_MESSAGE)
#else
u""
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
));
ToastManager::Get()->Show(
ToastData(kLobsterToastId, ToastCatalogName::kCopyImageToClipboardAction,
l10n_util::GetStringUTF16(
IDS_LOBSTER_COPY_IMAGE_TO_CLIPBOARD_TOAST_MESSAGE)));
return false;
}

52
ash/lobster/lobster_session_impl.cc

@ -23,6 +23,7 @@
#include "ash/resources/vector_icons/vector_icons.h"
#include "ash/shell.h"
#include "ash/shell_delegate.h"
#include "ash/strings/grit/ash_strings.h"
#include "base/containers/span.h"
#include "base/feature_list.h"
#include "base/files/file_path.h"
@ -36,9 +37,6 @@
#include "ui/message_center/message_center.h"
#include "ui/message_center/public/cpp/notification.h"
#include "ui/message_center/public/cpp/notifier_id.h"
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
#include "chromeos/ash/resources/internal/strings/grit/ash_internal_strings.h"
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
namespace ash {
namespace {
@ -53,77 +51,45 @@ constexpr char kLobsterFailedImageDownloadNotificationId[] =
"lobster_failed_image_download_notification_id";
std::u16string GetDownloadNotificationSourceLabel() {
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
return l10n_util::GetStringUTF16(
IDS_ASH_LOBSTER_IMAGE_DOWNLOAD_NOTIFICATION_SOURCE);
#else
return u"";
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
IDS_LOBSTER_IMAGE_DOWNLOAD_NOTIFICATION_SOURCE);
}
std::u16string GetSuccessfulImageDownloadNotificationTitle() {
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
return l10n_util::GetStringUTF16(
IDS_ASH_LOBSTER_SUCCESSFUL_IMAGE_DOWNLOAD_NOTIFICATION_TITLE);
#else
return u"";
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
IDS_LOBSTER_SUCCESSFUL_IMAGE_DOWNLOAD_NOTIFICATION_TITLE);
}
std::u16string GetFailedImageDownloadNotificationTitle(
const std::string& file_name) {
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
return l10n_util::GetStringFUTF16(
IDS_ASH_LOBSTER_FAILED_IMAGE_DOWNLOAD_NOTIFICATION_TITLE,
IDS_LOBSTER_FAILED_IMAGE_DOWNLOAD_NOTIFICATION_TITLE,
base::UTF8ToUTF16(file_name));
#else
return u"";
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
}
std::u16string GetFailedImageDownloadNotificationMessage() {
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
return l10n_util::GetStringUTF16(
IDS_ASH_LOBSTER_FAILED_IMAGE_DOWNLOAD_NOTIFICATION_MESSAGE);
#else
return u"";
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
IDS_LOBSTER_FAILED_IMAGE_DOWNLOAD_NOTIFICATION_MESSAGE);
}
std::u16string GetShowInFolderButtonLabel() {
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
return l10n_util::GetStringUTF16(
IDS_ASH_LOBSTER_SUCCESSFUL_IMAGE_DOWNLOAD_NOTIFICATION_SHOW_IN_FOLDER_ACTION_LABEL);
#else
return u"";
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
IDS_LOBSTER_SUCCESSFUL_IMAGE_DOWNLOAD_NOTIFICATION_SHOW_IN_FOLDER_ACTION_LABEL);
}
std::u16string GetCopyToClipboardButtonLabel() {
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
return l10n_util::GetStringUTF16(
IDS_ASH_LOBSTER_SUCCESSFUL_IMAGE_DOWNLOAD_NOTIFICATION_COPY_IMAGE_TO_CLIPBOARD_ACTION_LABEL);
#else
return u"";
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
IDS_LOBSTER_SUCCESSFUL_IMAGE_DOWNLOAD_NOTIFICATION_COPY_IMAGE_TO_CLIPBOARD_ACTION_LABEL);
}
std::u16string GetAnnouncementForInsertionSuccess() {
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
return l10n_util::GetStringUTF16(
IDS_ASH_LOBSTER_IMAGE_INSERTION_ANNOUNCEMENT_SUCCESS);
#else
return u"";
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
IDS_LOBSTER_IMAGE_INSERTION_ANNOUNCEMENT_SUCCESS);
}
std::u16string GetAnnouncementForInsertionFailure() {
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
return l10n_util::GetStringUTF16(
IDS_ASH_LOBSTER_IMAGE_INSERTION_ANNOUNCEMENT_FAILURE);
#else
return u"";
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
IDS_LOBSTER_IMAGE_INSERTION_ANNOUNCEMENT_FAILURE);
}
std::string BuildFeedbackDescription(std::string_view query,

6
ash/quick_insert/views/quick_insert_strings.cc

@ -37,11 +37,7 @@ std::u16string GetLabelForQuickInsertCategory(QuickInsertCategory category) {
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
case QuickInsertCategory::kLobsterWithNoSelectedText:
case QuickInsertCategory::kLobsterWithSelectedText:
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
return l10n_util::GetStringUTF16(IDS_PICKER_LOBSTER_SELECTION_LABEL);
#else
return u"Lobster";
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
return l10n_util::GetStringUTF16(IDS_LOBSTER_SELECTION_LABEL);
case QuickInsertCategory::kLinks:
return l10n_util::GetStringUTF16(IDS_PICKER_LINKS_CATEGORY_LABEL);
case QuickInsertCategory::kEmojisGifs:

7
ash/quick_insert/views/quick_insert_zero_state_view_unittest.cc

@ -531,13 +531,8 @@ TEST_F(QuickInsertZeroStateViewTest, ShowLobsterCategoryAsListItem) {
&QuickInsertSectionView::item_views_for_testing,
ElementsAre(AsView<QuickInsertListItemView>(Property(
&QuickInsertListItemView::GetPrimaryTextForTesting,
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
l10n_util::GetStringUTF16(
IDS_PICKER_LOBSTER_SELECTION_LABEL)
#else
u"Lobster"
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
)))))))));
IDS_LOBSTER_SELECTION_LABEL))))))))));
}
TEST_F(QuickInsertZeroStateViewTest, ShowsCaseTransformationBehindSubmenu) {

40
ash/system/magic_boost/magic_boost_disclaimer_view.cc

@ -37,10 +37,6 @@
#include "ui/views/widget/unique_widget_ptr.h"
#include "ui/views/widget/widget.h"
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
#include "chromeos/ash/resources/internal/strings/grit/ash_internal_strings.h"
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
namespace ash {
namespace {
@ -98,14 +94,9 @@ views::Builder<views::StyledLabel> GetTextBodyBuilder(
views::Builder<views::StyledLabel> GetParagraphOneBuilder() {
return GetTextBodyBuilder(
l10n_util::GetStringUTF16(
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
ash::features::IsLobsterEnabled()
? IDS_ASH_MAGIC_BOOST_WITH_LOBSTER_DISCLAIMER_PARAGRAPH_ONE
: IDS_ASH_MAGIC_BOOST_DISCLAMIER_PARAGRAPH_ONE)
#else
IDS_ASH_MAGIC_BOOST_DISCLAMIER_PARAGRAPH_ONE)
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
)
? IDS_LOBSTER_MAGIC_BOOST_DISCLAIMER_PARAGRAPH_ONE
: IDS_ASH_MAGIC_BOOST_DISCLAMIER_PARAGRAPH_ONE))
.SetID(magic_boost::ViewId::DisclaimerViewParagraphOne);
}
@ -115,14 +106,9 @@ views::Builder<views::StyledLabel> GetParagraphTwoBuilder(
const std::u16string link_text =
l10n_util::GetStringUTF16(IDS_ASH_MAGIC_BOOST_DISCLAIMER_TERMS_LINK_TEXT);
const std::u16string text = l10n_util::GetStringFUTF16(
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
ash::features::IsLobsterEnabled()
? IDS_ASH_MAGIC_BOOST_WITH_LOBSTER_DISCLAIMER_PARAGRAPH_TWO
: IDS_ASH_MAGIC_BOOST_DISCLAIMER_PARAGRAPH_TWO
#else
IDS_ASH_MAGIC_BOOST_DISCLAIMER_PARAGRAPH_TWO
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
,
? IDS_LOBSTER_MAGIC_BOOST_DISCLAIMER_PARAGRAPH_TWO
: IDS_ASH_MAGIC_BOOST_DISCLAIMER_PARAGRAPH_TWO,
{link_text}, &offsets);
return views::Builder<views::StyledLabel>()
@ -142,14 +128,9 @@ views::Builder<views::StyledLabel> GetParagraphTwoBuilder(
views::Builder<views::StyledLabel> GetParagraphThreeBuilder() {
return GetTextBodyBuilder(
l10n_util::GetStringUTF16(
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
ash::features::IsLobsterEnabled()
? IDS_ASH_MAGIC_BOOST_WITH_LOBSTER_DISCLAIMER_PARAGRAPH_THREE
: IDS_ASH_MAGIC_BOOST_DISCLAIMER_PARAGRAPH_THREE
#else
IDS_ASH_MAGIC_BOOST_DISCLAIMER_PARAGRAPH_THREE
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
))
? IDS_LOBSTER_MAGIC_BOOST_DISCLAIMER_PARAGRAPH_THREE
: IDS_ASH_MAGIC_BOOST_DISCLAIMER_PARAGRAPH_THREE))
.SetID(magic_boost::ViewId::DisclaimerViewParagraphThree);
}
@ -159,14 +140,9 @@ views::Builder<views::StyledLabel> GetParagraphFourBuilder(
const std::u16string link_text = l10n_util::GetStringUTF16(
IDS_ASH_MAGIC_BOOST_DISCLAIMER_LEARN_MORE_LINK_TEXT);
const std::u16string text = l10n_util::GetStringFUTF16(
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
ash::features::IsLobsterEnabled()
? IDS_ASH_MAGIC_BOOST_WITH_LOBSTER_DISCLAIMER_PARAGRAPH_FOUR
: IDS_ASH_MAGIC_BOOST_DISCLAIMER_PARAGRAPH_FOUR
#else
IDS_ASH_MAGIC_BOOST_DISCLAIMER_PARAGRAPH_FOUR
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
,
? IDS_LOBSTER_MAGIC_BOOST_DISCLAIMER_PARAGRAPH_FOUR
: IDS_ASH_MAGIC_BOOST_DISCLAIMER_PARAGRAPH_FOUR,
{link_text}, &offsets);
return views::Builder<views::StyledLabel>()

9
chrome/app/os_settings_strings.grdp

@ -7325,5 +7325,14 @@ Press &amp; hold keyboard keys to see accent marks and special characters. This
<message name="IDS_SETTINGS_SAFETY_HUB_VERSION_CARD_HEADER_UPDATED" desc="Safety Hub settings page (chrome://settings/safetyHub) gives users an overview over their safety status. The version card, which this text is a part of, informs the user whether their Chrome is up to date. This title of the card is shown when Chrome is up to date and the user does not need to take any action. Shown above the subtitle that is the Chrome version.">
ChromeOS is up to date
</message>
<!-- Lobster -->
<message name="IDS_LOBSTER_OS_SETTINGS_ENABLE" desc="The label of the toggle to enable/disable Image Generation in ChromeOS settings.">
Generate image
</message>
<message name="IDS_LOBSTER_OS_SETTINGS_ENABLE_DESCRIPTION" desc="The description of the toggle to enable/disable Image Generation in ChromeOS settings.">
Enter a custom prompt or highlight text to create an image.
</message>
</if>
</grit-part>

1
chrome/app/os_settings_strings_grdp/IDS_LOBSTER_OS_SETTINGS_ENABLE.png.sha1 Normal file

@ -0,0 +1 @@
6a570214880fcd19021a750ec88e47def52c4069

1
chrome/app/os_settings_strings_grdp/IDS_LOBSTER_OS_SETTINGS_ENABLE_DESCRIPTION.png.sha1 Normal file

@ -0,0 +1 @@
6a570214880fcd19021a750ec88e47def52c4069

22
chrome/browser/ui/ash/editor_menu/editor_menu_strings.cc

@ -12,10 +12,6 @@
#include "chromeos/strings/grit/chromeos_strings.h"
#include "ui/base/l10n/l10n_util.h"
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
#include "chromeos/ash/resources/internal/strings/grit/ash_internal_strings.h"
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
namespace chromeos::editor_menu {
namespace {
@ -39,19 +35,11 @@ bool ShouldUseL10nStrings() {
} // namespace
std::u16string GetEditorMenuLobsterTitle() {
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
return l10n_util::GetStringUTF16(IDS_EDITOR_MENU_CARD_LOBSTER_TAB_LABEL);
#else
return u"";
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
return l10n_util::GetStringUTF16(IDS_LOBSTER_EDITOR_MENU_CARD_TAB_LABEL);
}
std::u16string GetEditorMenuLobsterChipLabel() {
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
return l10n_util::GetStringUTF16(IDS_EDITOR_MENU_CARD_LOBSTER_CHIP_LABEL);
#else
return u"Lobster";
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
return l10n_util::GetStringUTF16(IDS_LOBSTER_EDITOR_MENU_CARD_CHIP_LABEL);
}
std::u16string GetEditorMenuPromoCardTitle() {
@ -104,12 +92,8 @@ std::u16string GetEditorMenuFreeformPromptInputFieldPlaceholderForLobster() {
return u"Enter a prompt";
}
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
return l10n_util::GetStringUTF16(
IDS_EDITOR_MENU_CARD_LOBSTER_FREEFORM_PLACEHOLDER);
#else
return u"";
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
IDS_LOBSTER_EDITOR_MENU_CARD_FREEFORM_PLACEHOLDER);
}
std::u16string GetEditorMenuSettingsTooltip() {

10
chrome/browser/ui/webui/ash/settings/pages/search/search_section.cc

@ -44,10 +44,6 @@
#include "ui/chromeos/devicetype_utils.h"
#include "ui/webui/webui_util.h"
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
#include "chromeos/ash/resources/internal/strings/grit/ash_internal_strings.h"
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
namespace ash::settings {
namespace mojom {
@ -395,10 +391,8 @@ void SearchSection::AddLoadTimeData(content::WebUIDataSource* html_source) {
{"enableHelpMeWrite", IDS_OS_SETTINGS_ENABLE_HELP_ME_WRITE},
{"enableHelpMeWriteDesc",
IDS_OS_SETTINGS_ENABLE_HELP_ME_WRITE_DESCRIPTION},
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
{"enableLobster", IDS_OS_SETTINGS_ENABLE_LOBSTER},
{"enableLobsterDesc", IDS_OS_SETTINGS_ENABLE_LOBSTER_DESCRIPTION},
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
{"enableLobster", IDS_LOBSTER_OS_SETTINGS_ENABLE},
{"enableLobsterDesc", IDS_LOBSTER_OS_SETTINGS_ENABLE_DESCRIPTION},
{"osSearchEngineLabel", IDS_OS_SETTINGS_SEARCH_ENGINE_LABEL},
{"searchSubpageTitle", IDS_SETTINGS_SEARCH_SUBPAGE_TITLE},
{"searchGoogleAssistant", IDS_SETTINGS_SEARCH_GOOGLE_ASSISTANT},

11
chromeos/chromeos_strings.grd

@ -531,6 +531,17 @@
Send
</message>
<!-- Lobster -->
<message name="IDS_LOBSTER_EDITOR_MENU_CARD_TAB_LABEL" desc="The label for Image Generation tab in the Editor menu card.">
Create image
</message>
<message name="IDS_LOBSTER_EDITOR_MENU_CARD_CHIP_LABEL" desc="The label for Image Generation chip in the Editor menu card.">
Create image
</message>
<message name="IDS_LOBSTER_EDITOR_MENU_CARD_FREEFORM_PLACEHOLDER" desc="Placeholder text in the freeform textfield of the Editor Menu Card when the Image Generation tab is selected.">
Enter a prompt like "draw a misty forest"
</message>
<!-- Multitask Menu -->
<message name="IDS_MULTITASK_MENU_HALF_BUTTON_NAME" desc="Title of the half button on the multitask menu." meaning="Splits the associated window into half snapped state.">
Split

1
chromeos/chromeos_strings_grd/IDS_LOBSTER_EDITOR_MENU_CARD_CHIP_LABEL.png.sha1 Normal file

@ -0,0 +1 @@
6eb42f62ea082b4ac575cf8ceb2179b04f6b54fc

1
chromeos/chromeos_strings_grd/IDS_LOBSTER_EDITOR_MENU_CARD_FREEFORM_PLACEHOLDER.png.sha1 Normal file

@ -0,0 +1 @@
a9ccdeeaacd8d262c77146380d7abafbcfbbc372

1
chromeos/chromeos_strings_grd/IDS_LOBSTER_EDITOR_MENU_CARD_TAB_LABEL.png.sha1 Normal file

@ -0,0 +1 @@
a9ccdeeaacd8d262c77146380d7abafbcfbbc372