summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/app/chromium_strings.grd3
-rw-r--r--chrome/app/google_chrome_strings.grd3
-rw-r--r--chrome/browser/first_run_win.cc8
3 files changed, 13 insertions, 1 deletions
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
index c8b4b21..5de762d 100644
--- a/chrome/app/chromium_strings.grd
+++ b/chrome/app/chromium_strings.grd
@@ -379,6 +379,9 @@ be available for now. -->
<message name="IDS_TRY_TOAST_HEADING" desc="Top line of the try-chrome-again dialog">
There is a new version of Chromium available.
</message>
+ <message name="IDS_TRY_TOAST_ALT_HEADING" desc="Alternate top line of the try-chrome-again dialog">
+ There's a new version of Chromium available that includes extensions.
+ </message>
<message name="IDS_TRY_TOAST_TRY_OPT" desc="First option radio button on the dialog to try chrome">
Try it out (already installed)
</message>
diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd
index 7f642d1..9cd9a71 100644
--- a/chrome/app/google_chrome_strings.grd
+++ b/chrome/app/google_chrome_strings.grd
@@ -429,6 +429,9 @@ Chrome supports. -->
<message name="IDS_TRY_TOAST_HEADING" desc="Top line of the try-chrome-again dialog">
There is a new version of Google Chrome available.
</message>
+ <message name="IDS_TRY_TOAST_ALT_HEADING" desc="Alternate top line of the try-chrome-again dialog">
+ There's a new version of Google Chrome available that includes extensions.
+ </message>
<message name="IDS_TRY_TOAST_TRY_OPT" desc="First option radio button on the dialog to try chrome">
Try it out (already installed)
</message>
diff --git a/chrome/browser/first_run_win.cc b/chrome/browser/first_run_win.cc
index ef1256a..9b754f8 100644
--- a/chrome/browser/first_run_win.cc
+++ b/chrome/browser/first_run_win.cc
@@ -774,7 +774,12 @@ class TryChromeDialog : public views::ButtonListener,
// First row views.
layout->StartRow(0, 0);
layout->AddView(icon);
- const std::wstring heading = l10n_util::GetString(IDS_TRY_TOAST_HEADING);
+ // The heading has two flavors of text, the alt one features extensions but
+ // we only use it in the US until some international issues are fixed.
+ const std::string app_locale = g_browser_process->GetApplicationLocale();
+ const std::wstring heading = (app_locale == "en-US") ?
+ l10n_util::GetString(IDS_TRY_TOAST_ALT_HEADING) :
+ l10n_util::GetString(IDS_TRY_TOAST_HEADING);
views::Label* label =
new views::Label(heading);
label->SetFont(rb.GetFont(ResourceBundle::MediumBoldFont));
@@ -782,6 +787,7 @@ class TryChromeDialog : public views::ButtonListener,
label->SizeToFit(200);
label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
layout->AddView(label);
+ // The close button is custom.
views::ImageButton* close_button = new views::ImageButton(this);
close_button->SetImage(views::CustomButton::BS_NORMAL,
rb.GetBitmapNamed(IDR_CLOSE_BAR));