diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-20 19:30:56 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-20 19:30:56 +0000 |
| commit | ed1035a6e6db7cfe8578d1dbcf9567a114b5cb74 (patch) | |
| tree | b639a27f7e168666b0bfe368ed9024b39b61dbfb /views/window | |
| parent | be417138245009f5e42963374af6c4880192acb7 (diff) | |
| download | chromium_src-ed1035a6e6db7cfe8578d1dbcf9567a114b5cb74.zip chromium_src-ed1035a6e6db7cfe8578d1dbcf9567a114b5cb74.tar.gz chromium_src-ed1035a6e6db7cfe8578d1dbcf9567a114b5cb74.tar.bz2 | |
Add generated files to svn:ignore list for views subdir.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16508 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, 4 insertions, 5 deletions
diff --git a/views/window/dialog_client_view.cc b/views/window/dialog_client_view.cc index 5a36830..9650f26 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/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 @@ void DialogClientView::ShowDialogButtons() { 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 @@ void DialogClientView::ShowDialogButtons() { 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 = diff --git a/views/window/window_win.cc b/views/window/window_win.cc index 2286762..2ba4797 100644 --- a/views/window/window_win.cc +++ b/views/window/window_win.cc @@ -14,7 +14,6 @@ #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" |