| Index: ash/common/accelerators/exit_warning_handler.cc
|
| diff --git a/ash/common/accelerators/exit_warning_handler.cc b/ash/common/accelerators/exit_warning_handler.cc
|
| index 9393425d4ef92ce60a5395fd7764bbc75a3019eb..dc569d7193d3a9a9244bd1e9db241792090418dd 100644
|
| --- a/ash/common/accelerators/exit_warning_handler.cc
|
| +++ b/ash/common/accelerators/exit_warning_handler.cc
|
| @@ -40,16 +40,13 @@ const int kVerticalMarginAroundText = 100;
|
|
|
| class ExitWarningWidgetDelegateView : public views::WidgetDelegateView {
|
| public:
|
| - ExitWarningWidgetDelegateView() : text_width_(0), width_(0), height_(0) {
|
| -#ifdef OS_CHROMEOS
|
| - text_ = l10n_util::GetStringUTF16(IDS_ASH_SIGN_OUT_WARNING_POPUP_TEXT);
|
| - accessible_name_ = l10n_util::GetStringUTF16(
|
| - IDS_ASH_SIGN_OUT_WARNING_POPUP_TEXT_ACCESSIBLE);
|
| -#else
|
| - text_ = l10n_util::GetStringUTF16(IDS_ASH_EXIT_WARNING_POPUP_TEXT);
|
| - accessible_name_ =
|
| - l10n_util::GetStringUTF16(IDS_ASH_EXIT_WARNING_POPUP_TEXT_ACCESSIBLE);
|
| -#endif
|
| + ExitWarningWidgetDelegateView()
|
| + : text_(l10n_util::GetStringUTF16(IDS_ASH_SIGN_OUT_WARNING_POPUP_TEXT)),
|
| + accessible_name_(l10n_util::GetStringUTF16(
|
| + IDS_ASH_SIGN_OUT_WARNING_POPUP_TEXT_ACCESSIBLE)),
|
| + text_width_(0),
|
| + width_(0),
|
| + height_(0) {
|
| ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
|
| const gfx::FontList& font_list =
|
| rb.GetFontList(ui::ResourceBundle::LargeFont);
|
|
|