diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-20 18:27:06 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-20 18:27:06 +0000 |
| commit | 9dd7e3d78c14f67c5c3d78868a3a63bbc4f90634 (patch) | |
| tree | 3b7332926a05a1c8382eb27422c385b56b29cb24 /chrome/browser/ui/views/update_recommended_message_box.cc | |
| parent | a12f7fbe12afffb4b1b31ec0d6b0988f1f9a6554 (diff) | |
| download | chromium_src-9dd7e3d78c14f67c5c3d78868a3a63bbc4f90634.zip chromium_src-9dd7e3d78c14f67c5c3d78868a3a63bbc4f90634.tar.gz chromium_src-9dd7e3d78c14f67c5c3d78868a3a63bbc4f90634.tar.bz2 | |
Move a bunch of random other files to src/ui/base
BUG=none
TEST=none
TBR=brettw
Review URL: http://codereview.chromium.org/6257006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71970 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views/update_recommended_message_box.cc')
| -rw-r--r-- | chrome/browser/ui/views/update_recommended_message_box.cc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/chrome/browser/ui/views/update_recommended_message_box.cc b/chrome/browser/ui/views/update_recommended_message_box.cc index c3f8f6a..d03eabb 100644 --- a/chrome/browser/ui/views/update_recommended_message_box.cc +++ b/chrome/browser/ui/views/update_recommended_message_box.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/update_recommended_message_box.h" #include "app/l10n_util.h" -#include "app/message_box_flags.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" @@ -14,6 +13,7 @@ #include "chrome/common/pref_names.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" +#include "ui/base/message_box_flags.h" #include "views/controls/message_box_view.h" #include "views/window/window.h" @@ -47,15 +47,15 @@ bool UpdateRecommendedMessageBox::Accept() { } int UpdateRecommendedMessageBox::GetDialogButtons() const { - return MessageBoxFlags::DIALOGBUTTON_OK | - MessageBoxFlags::DIALOGBUTTON_CANCEL; + return ui::MessageBoxFlags::DIALOGBUTTON_OK | + ui::MessageBoxFlags::DIALOGBUTTON_CANCEL; } std::wstring UpdateRecommendedMessageBox::GetDialogButtonLabel( - MessageBoxFlags::DialogButton button) const { - DCHECK(button == MessageBoxFlags::DIALOGBUTTON_OK || - button == MessageBoxFlags::DIALOGBUTTON_CANCEL); - return button == MessageBoxFlags::DIALOGBUTTON_OK ? + ui::MessageBoxFlags::DialogButton button) const { + DCHECK(button == ui::MessageBoxFlags::DIALOGBUTTON_OK || + button == ui::MessageBoxFlags::DIALOGBUTTON_CANCEL); + return button == ui::MessageBoxFlags::DIALOGBUTTON_OK ? UTF16ToWide(l10n_util::GetStringUTF16(IDS_RESTART_AND_UPDATE)) : UTF16ToWide(l10n_util::GetStringUTF16(IDS_NOT_NOW)); } @@ -90,7 +90,8 @@ UpdateRecommendedMessageBox::UpdateRecommendedMessageBox( const string16 product_name = l10n_util::GetStringUTF16(kProductNameId); // Also deleted when the window closes. message_box_view_ = new MessageBoxView( - MessageBoxFlags::kFlagHasMessage | MessageBoxFlags::kFlagHasOKButton, + ui::MessageBoxFlags::kFlagHasMessage | + ui::MessageBoxFlags::kFlagHasOKButton, UTF16ToWide(l10n_util::GetStringFUTF16(IDS_UPDATE_RECOMMENDED, product_name)), std::wstring(), |