Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(284)

Unified Diff: ash/common/accelerators/exit_warning_handler.cc

Issue 2689143002: ash: Remove OS_CHROMEOS ifdefs from accelerator files (Closed)
Patch Set: rebase Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/accelerators/debug_commands.cc ('k') | ash/host/ash_window_tree_host_x11.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « ash/common/accelerators/debug_commands.cc ('k') | ash/host/ash_window_tree_host_x11.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698