summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/frame
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-23 01:15:50 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-23 01:15:50 +0000
commit9dcb5966fd4c0e611034702fa0a6d3358ea37355 (patch)
tree1457d65d0aff4b134267b699572d4a59912ce10a /chrome/browser/views/frame
parent13cdde22f51438848b28a58de3bb22996e7c6661 (diff)
downloadchromium_src-9dcb5966fd4c0e611034702fa0a6d3358ea37355.zip
chromium_src-9dcb5966fd4c0e611034702fa0a6d3358ea37355.tar.gz
chromium_src-9dcb5966fd4c0e611034702fa0a6d3358ea37355.tar.bz2
Download in progress dialog:
- Change hardcoded "Google Chrome" to product name. - Implement for GTK. BUG=21652 Review URL: http://codereview.chromium.org/212051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26891 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/frame')
-rw-r--r--chrome/browser/views/frame/browser_view.cc19
1 files changed, 12 insertions, 7 deletions
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index 78a091c..0832c8d 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -252,7 +252,8 @@ class DownloadInProgressConfirmDialogDelegate : public views::DialogDelegate,
public views::View {
public:
explicit DownloadInProgressConfirmDialogDelegate(Browser* browser)
- : browser_(browser) {
+ : browser_(browser),
+ product_name_(l10n_util::GetString(IDS_PRODUCT_NAME)) {
int download_count = browser->profile()->GetDownloadManager()->
in_progress_count();
@@ -260,9 +261,11 @@ class DownloadInProgressConfirmDialogDelegate : public views::DialogDelegate,
std::wstring explanation_text;
if (download_count == 1) {
warning_text =
- l10n_util::GetString(IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_WARNING);
+ l10n_util::GetStringF(IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_WARNING,
+ product_name_);
explanation_text =
- l10n_util::GetString(IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION);
+ l10n_util::GetStringF(IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_EXPLANATION,
+ product_name_);
ok_button_text_ = l10n_util::GetString(
IDS_SINGLE_DOWNLOAD_REMOVE_CONFIRM_OK_BUTTON_LABEL);
cancel_button_text_ = l10n_util::GetString(
@@ -270,10 +273,10 @@ class DownloadInProgressConfirmDialogDelegate : public views::DialogDelegate,
} else {
warning_text =
l10n_util::GetStringF(IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_WARNING,
- download_count);
+ product_name_, IntToString16(download_count));
explanation_text =
- l10n_util::GetString(
- IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_EXPLANATION);
+ l10n_util::GetStringF(
+ IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_EXPLANATION, product_name_);
ok_button_text_ = l10n_util::GetString(
IDS_MULTIPLE_DOWNLOADS_REMOVE_CONFIRM_OK_BUTTON_LABEL);
cancel_button_text_ = l10n_util::GetString(
@@ -350,7 +353,7 @@ class DownloadInProgressConfirmDialogDelegate : public views::DialogDelegate,
}
virtual std::wstring GetWindowTitle() const {
- return l10n_util::GetString(IDS_PRODUCT_NAME);
+ return product_name_;
}
private:
@@ -361,6 +364,8 @@ class DownloadInProgressConfirmDialogDelegate : public views::DialogDelegate,
std::wstring ok_button_text_;
std::wstring cancel_button_text_;
+ std::wstring product_name_;
+
DISALLOW_COPY_AND_ASSIGN(DownloadInProgressConfirmDialogDelegate);
};