diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-20 19:36:24 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-20 19:36:24 +0000 |
| commit | 61bd7d155e1ce5a3e14198b6170157faddf336e3 (patch) | |
| tree | b9ea0859298b2524293e59c28e6c0c6d169e1912 /views/window | |
| parent | ed1035a6e6db7cfe8578d1dbcf9567a114b5cb74 (diff) | |
| download | chromium_src-61bd7d155e1ce5a3e14198b6170157faddf336e3.zip chromium_src-61bd7d155e1ce5a3e14198b6170157faddf336e3.tar.gz chromium_src-61bd7d155e1ce5a3e14198b6170157faddf336e3.tar.bz2 | |
revert this change, svn seems to have committed it with my property-edit.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16509 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/window')
| -rw-r--r-- | views/window/dialog_client_view.cc | 8 | ||||
| -rw-r--r-- | views/window/window_win.cc | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/views/window/dialog_client_view.cc b/views/window/dialog_client_view.cc index 9650f26..5a36830 100644 --- a/views/window/dialog_client_view.cc +++ b/views/window/dialog_client_view.cc @@ -13,7 +13,7 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/gfx/native_theme.h" -#include "grit/app_strings.h" +#include "grit/generated_resources.h" #include "views/controls/button/native_button.h" #include "views/standard_layout.h" #include "views/window/dialog_delegate.h" @@ -109,7 +109,7 @@ void DialogClientView::ShowDialogButtons() { std::wstring label = dd->GetDialogButtonLabel(MessageBoxFlags::DIALOGBUTTON_OK); if (label.empty()) - label = l10n_util::GetString(IDS_APP_OK); + label = l10n_util::GetString(IDS_OK); bool is_default_button = (dd->GetDefaultDialogButton() & MessageBoxFlags::DIALOGBUTTON_OK) != 0; ok_button_ = new DialogButton(this, window(), @@ -127,9 +127,9 @@ void DialogClientView::ShowDialogButtons() { dd->GetDialogButtonLabel(MessageBoxFlags::DIALOGBUTTON_CANCEL); if (label.empty()) { if (buttons & MessageBoxFlags::DIALOGBUTTON_OK) { - label = l10n_util::GetString(IDS_APP_CANCEL); + label = l10n_util::GetString(IDS_CANCEL); } else { - label = l10n_util::GetString(IDS_APP_CLOSE); + label = l10n_util::GetString(IDS_CLOSE); } } bool is_default_button = diff --git a/views/window/window_win.cc b/views/window/window_win.cc index 2ba4797..2286762 100644 --- a/views/window/window_win.cc +++ b/views/window/window_win.cc @@ -14,6 +14,7 @@ #include "app/resource_bundle.h" #include "app/win_util.h" #include "base/win_util.h" +#include "grit/generated_resources.h" #include "views/widget/root_view.h" #include "views/window/client_view.h" #include "views/window/custom_frame_view.h" |