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

Unified Diff: athena/content/web_activity.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/content/render_view_context_menu_impl.cc ('k') | athena/home/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/content/web_activity.cc
diff --git a/athena/content/web_activity.cc b/athena/content/web_activity.cc
index 506d635dd7e0672c97565b53d36f1b93b0bc253b..794de17e59bee5c208f65df8512a149dd6c868c2 100644
--- a/athena/content/web_activity.cc
+++ b/athena/content/web_activity.cc
@@ -9,6 +9,7 @@
#include "athena/content/content_proxy.h"
#include "athena/content/public/dialogs.h"
#include "athena/input/public/accelerator_manager.h"
+#include "athena/strings/grit/athena_strings.h"
#include "base/bind.h"
#include "base/command_line.h"
#include "base/strings/utf_string_conversions.h"
@@ -20,6 +21,7 @@
#include "content/public/common/content_switches.h"
#include "content/public/common/favicon_url.h"
#include "ui/aura/window.h"
+#include "ui/base/l10n/l10n_util.h"
#include "ui/compositor/closure_animation_observer.h"
#include "ui/compositor/scoped_layer_animation_settings.h"
#include "ui/views/background.h"
@@ -372,7 +374,8 @@ class AthenaWebView : public views::WebView {
params.parent = GetWidget()->GetNativeView();
reload_message_->Init(params);
- views::Label* label = new views::Label(base::UTF8ToUTF16("Reload"));
+ views::Label* label = new views::Label(
+ l10n_util::GetStringUTF16(IDS_ATHENA_PULL_TO_RELOAD_MESSAGE));
label->SetBackgroundColor(SK_ColorGRAY);
label->set_background(
views::Background::CreateSolidBackground(SK_ColorGRAY));
« no previous file with comments | « athena/content/render_view_context_menu_impl.cc ('k') | athena/home/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698