diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-29 17:31:12 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-29 17:31:12 +0000 |
| commit | a13c5ece0031a6e898cbc32f9db69cdfdbef36e0 (patch) | |
| tree | c33358450421d7d6fdb372a8d92a8c9050367573 /views/controls | |
| parent | 74a26d7aa51cd54616a48ec6d830381e57c7c805 (diff) | |
| download | chromium_src-a13c5ece0031a6e898cbc32f9db69cdfdbef36e0.zip chromium_src-a13c5ece0031a6e898cbc32f9db69cdfdbef36e0.tar.gz chromium_src-a13c5ece0031a6e898cbc32f9db69cdfdbef36e0.tar.bz2 | |
views: Change MessageBoxView::GetInputText() to string16.
BUG=68267
R=sky@chromium.org
Review URL: http://codereview.chromium.org/8071015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103299 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls')
| -rw-r--r-- | views/controls/message_box_view.cc | 6 | ||||
| -rw-r--r-- | views/controls/message_box_view.h | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/views/controls/message_box_view.cc b/views/controls/message_box_view.cc index 63bbfd7..cd51b67 100644 --- a/views/controls/message_box_view.cc +++ b/views/controls/message_box_view.cc @@ -53,10 +53,8 @@ MessageBoxView::MessageBoxView(int dialog_flags, MessageBoxView::~MessageBoxView() {} -std::wstring MessageBoxView::GetInputText() { - if (prompt_field_) - return UTF16ToWideHack(prompt_field_->text()); - return std::wstring(); +string16 MessageBoxView::GetInputText() { + return prompt_field_ ? prompt_field_->text() : string16(); } bool MessageBoxView::IsCheckBoxSelected() { diff --git a/views/controls/message_box_view.h b/views/controls/message_box_view.h index ac6f932..e278d38 100644 --- a/views/controls/message_box_view.h +++ b/views/controls/message_box_view.h @@ -8,6 +8,7 @@ #include <string> +#include "base/string16.h" #include "views/view.h" namespace views { @@ -37,7 +38,7 @@ class VIEWS_EXPORT MessageBoxView : public View { views::Textfield* text_box() { return prompt_field_; } // Returns user entered data in the prompt field. - std::wstring GetInputText(); + string16 GetInputText(); // Returns true if a checkbox is selected, false otherwise. (And false if // the message box has no checkbox.) |