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

Unified Diff: athena/system/power_button_controller.cc

Issue 591803002: Add athena_strings.grd with athena specific strings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « athena/system/DEPS ('k') | athena/wm/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/system/power_button_controller.cc
diff --git a/athena/system/power_button_controller.cc b/athena/system/power_button_controller.cc
index 521dbde6417ba65e532f2f263c284fbbb647ae64..e1105b90e9ad458f4816dfc5d525aa5e4247813d 100644
--- a/athena/system/power_button_controller.cc
+++ b/athena/system/power_button_controller.cc
@@ -5,8 +5,9 @@
#include "athena/system/power_button_controller.h"
#include "athena/screen/public/screen_manager.h"
-#include "base/strings/utf_string_conversions.h"
+#include "athena/strings/grit/athena_strings.h"
#include "chromeos/dbus/dbus_thread_manager.h"
+#include "ui/base/l10n/l10n_util.h"
#include "ui/gfx/font_list.h"
#include "ui/views/background.h"
#include "ui/views/border.h"
@@ -50,9 +51,8 @@ void PowerButtonController::ShowShutdownWarningDialog() {
params.parent = warning_message_container_;
shutdown_warning_message_->Init(params);
- // TODO(pkotwicz): Get text from the resource.
- views::Label* label = new views::Label(
- base::UTF8ToUTF16("Keep holding power button to shutdown."));
+ views::Label* label =
+ new views::Label(l10n_util::GetStringUTF16(IDS_ATHENA_SHUTDOWN_WARNING));
label->SetBackgroundColor(SK_ColorWHITE);
label->SetFontList(gfx::FontList().DeriveWithStyle(gfx::Font::BOLD));
« no previous file with comments | « athena/system/DEPS ('k') | athena/wm/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698