Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Unified Diff: views/window/dialog_client_view.cc

Issue 113612: Make views/ use strings from app_strings. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/views.vsprops ('k') | views/window/window_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/window/dialog_client_view.cc
===================================================================
--- views/window/dialog_client_view.cc (revision 16509)
+++ views/window/dialog_client_view.cc (working copy)
@@ -13,7 +13,7 @@
#include "app/l10n_util.h"
#include "app/resource_bundle.h"
#include "base/gfx/native_theme.h"
-#include "grit/generated_resources.h"
+#include "grit/app_strings.h"
#include "views/controls/button/native_button.h"
#include "views/standard_layout.h"
#include "views/window/dialog_delegate.h"
@@ -109,7 +109,7 @@
std::wstring label =
dd->GetDialogButtonLabel(MessageBoxFlags::DIALOGBUTTON_OK);
if (label.empty())
- label = l10n_util::GetString(IDS_OK);
+ label = l10n_util::GetString(IDS_APP_OK);
bool is_default_button =
(dd->GetDefaultDialogButton() & MessageBoxFlags::DIALOGBUTTON_OK) != 0;
ok_button_ = new DialogButton(this, window(),
@@ -127,9 +127,9 @@
dd->GetDialogButtonLabel(MessageBoxFlags::DIALOGBUTTON_CANCEL);
if (label.empty()) {
if (buttons & MessageBoxFlags::DIALOGBUTTON_OK) {
- label = l10n_util::GetString(IDS_CANCEL);
+ label = l10n_util::GetString(IDS_APP_CANCEL);
} else {
- label = l10n_util::GetString(IDS_CLOSE);
+ label = l10n_util::GetString(IDS_APP_CLOSE);
}
}
bool is_default_button =
« no previous file with comments | « views/views.vsprops ('k') | views/window/window_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698