| Index: chrome/browser/chromeos/enrollment_dialog_view.cc
|
| diff --git a/chrome/browser/chromeos/enrollment_dialog_view.cc b/chrome/browser/chromeos/enrollment_dialog_view.cc
|
| index 83feb243f935a3367d7fdf336d94a74a7c6752fb..9fb47143e692548341f3a656e863bb3c9fced183 100644
|
| --- a/chrome/browser/chromeos/enrollment_dialog_view.cc
|
| +++ b/chrome/browser/chromeos/enrollment_dialog_view.cc
|
| @@ -49,11 +49,12 @@ class EnrollmentDialogView : public views::DialogDelegateView {
|
| virtual int GetDialogButtons() const OVERRIDE;
|
| virtual bool Accept() OVERRIDE;
|
| virtual void OnClosed() OVERRIDE;
|
| - virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE;
|
| + virtual base::string16 GetDialogButtonLabel(
|
| + ui::DialogButton button) const OVERRIDE;
|
|
|
| // views::WidgetDelegate overrides
|
| virtual ui::ModalType GetModalType() const OVERRIDE;
|
| - virtual string16 GetWindowTitle() const OVERRIDE;
|
| + virtual base::string16 GetWindowTitle() const OVERRIDE;
|
|
|
| // views::View overrides
|
| virtual gfx::Size GetPreferredSize() OVERRIDE;
|
| @@ -126,7 +127,7 @@ void EnrollmentDialogView::OnClosed() {
|
| chrome::Navigate(¶ms);
|
| }
|
|
|
| -string16 EnrollmentDialogView::GetDialogButtonLabel(
|
| +base::string16 EnrollmentDialogView::GetDialogButtonLabel(
|
| ui::DialogButton button) const {
|
| if (button == ui::DIALOG_BUTTON_OK)
|
| return l10n_util::GetStringUTF16(IDS_NETWORK_ENROLLMENT_HANDLER_BUTTON);
|
| @@ -137,7 +138,7 @@ ui::ModalType EnrollmentDialogView::GetModalType() const {
|
| return ui::MODAL_TYPE_SYSTEM;
|
| }
|
|
|
| -string16 EnrollmentDialogView::GetWindowTitle() const {
|
| +base::string16 EnrollmentDialogView::GetWindowTitle() const {
|
| return l10n_util::GetStringUTF16(IDS_NETWORK_ENROLLMENT_HANDLER_TITLE);
|
| }
|
|
|
|
|