Commit 37f2427e authored by Ian Vollick's avatar Ian Vollick Committed by Commit Bot

[vr] Avoid all caps in audio permission prompt strings

With this CL, these resources are no longer specified in all caps.
Instead, they are converted to all caps before rendering.

Bug: 779669
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: Iac4c83813a649949aa130677b23b06be259a9685
Reviewed-on: https://chromium-review.googlesource.com/777861
Commit-Queue: Ian Vollick <vollick@chromium.org>
Reviewed-by: default avatarAmirhossein Simjour <asimjour@chromium.org>
Reviewed-by: default avatarBiao She <bshe@chromium.org>
Cr-Commit-Position: refs/heads/master@{#517623}
parent 2a38ff88
......@@ -11036,10 +11036,10 @@ read aloud to screenreader users to announce that a completion is available.">
Allow Chrome to record audio?
</message>
<message name="IDS_VR_SHELL_AUDIO_PERMISSION_PROMPT_ABORT_BUTTON" desc="Text on the cancel button of the prompt that shows up in VR when user needs to grant audio permission to Chrome">
CANCEL
Cancel
</message>
<message name="IDS_VR_SHELL_AUDIO_PERMISSION_PROMPT_CONTINUE_BUTTON" desc="Text on the exit button of the prompt that shows up when user needs to grant audio permission to Chrome to perform a voice search">
CONTINUE
Continue
</message>
<message name="IDS_VR_SHELL_EXIT_PROMPT_EXIT_VR_BUTTON" desc="Text on the exit button of the exit prompt that shows up when the user clicks on URL bar security icon in VR">
EXIT VR
......
......@@ -4,6 +4,7 @@
#include "chrome/browser/vr/elements/audio_permission_prompt_texture.h"
#include "base/i18n/case_conversion.h"
#include "cc/paint/skia_paint_canvas.h"
#include "chrome/browser/vr/color_scheme.h"
#include "chrome/browser/vr/elements/vector_icon.h"
......@@ -90,8 +91,8 @@ void AudioPermissionPromptTexture::Draw(SkCanvas* sk_canvas,
GetFontList(ToPixels(kFontSizePromptButtonText), text, &fonts);
// Secondary button area.
text = l10n_util::GetStringUTF16(
IDS_VR_SHELL_AUDIO_PERMISSION_PROMPT_ABORT_BUTTON);
text = base::i18n::ToUpper(l10n_util::GetStringUTF16(
IDS_VR_SHELL_AUDIO_PERMISSION_PROMPT_ABORT_BUTTON));
lines = PrepareDrawStringRect(
text, fonts,
color_scheme().audio_permission_prompt_secondary_button_forground,
......@@ -114,8 +115,8 @@ void AudioPermissionPromptTexture::Draw(SkCanvas* sk_canvas,
canvas->Restore();
// Primary button area.
text = l10n_util::GetStringUTF16(
IDS_VR_SHELL_AUDIO_PERMISSION_PROMPT_CONTINUE_BUTTON);
text = base::i18n::ToUpper(l10n_util::GetStringUTF16(
IDS_VR_SHELL_AUDIO_PERMISSION_PROMPT_CONTINUE_BUTTON));
button_text_size.set_size(gfx::Size(ToPixels(kButtonWidth), 0));
lines = PrepareDrawStringRect(
text, fonts, color_scheme().audio_permission_prompt_background,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment