Add athena_strings.grd with athena specific strings

athena/wm/overview_toolbar.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "athena/wm/overview_toolbar.h"
 
 #include "athena/resources/grit/athena_resources.h"
+#include "athena/strings/grit/athena_strings.h"
 #include "base/bind.h"
-#include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "ui/aura/window.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/closure_animation_observer.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_delegate.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/transform.h"
 
 namespace {
 
 const int kActionButtonImageSize = 54;
 const int kActionButtonTextSize = 20;
 const int kActionButtonPaddingFromRight = 32;
 }
 
 namespace athena {
 
 class ActionButton : public ui::LayerDelegate {
  public:
-  ActionButton(int resource_id, const std::string& label)
-      : resource_id_(resource_id), label_(base::UTF8ToUTF16(label)) {
+  ActionButton(int resource_id, const base::string16& label)
+      : resource_id_(resource_id), label_(label) {
     layer_.reset(new ui::Layer(ui::LAYER_TEXTURED));
     layer_->set_delegate(this);
     layer_->SetFillsBoundsOpaquely(false);
     layer_->SetVisible(true);
     layer_->SetOpacity(0);
   }
 
   virtual ~ActionButton() {}
 
   static void DestroyAfterFadeout(scoped_ptr<ActionButton> button) {
@@ skipping 48 matching lines @@
   int resource_id_;
   base::string16 label_;
   scoped_ptr<ui::Layer> layer_;
 
   DISALLOW_COPY_AND_ASSIGN(ActionButton);
 };
 
 OverviewToolbar::OverviewToolbar(aura::Window* container)
     : shown_(false),
       disabled_action_bitfields_(0),
-      close_(new ActionButton(IDR_ATHENA_OVERVIEW_TRASH, "Close")),
-      split_(new ActionButton(IDR_ATHENA_OVERVIEW_SPLIT, "Split")),
+      close_(new ActionButton(
+          IDR_ATHENA_OVERVIEW_TRASH,
+          l10n_util::GetStringUTF16(IDS_ATHENA_OVERVIEW_CLOSE))),
+      split_(new ActionButton(
+          IDR_ATHENA_OVERVIEW_SPLIT,
+          l10n_util::GetStringUTF16(IDS_ATHENA_OVERVIEW_SPLIT))),
       current_action_(ACTION_TYPE_NONE),
       container_bounds_(container->bounds()) {
   const int kPaddingFromBottom = 200;
   const int kPaddingBetweenButtons = 200;
 
   int x = container_bounds_.right() -
           (kActionButtonPaddingFromRight + kActionButtonImageSize);
   int y = container_bounds_.bottom() -
           (kPaddingFromBottom + kActionButtonImageSize);
   split_->SetPosition(gfx::Point(x, y));
@@ skipping 92 matching lines @@
       button->layer()->GetAnimator());
   split_settings.SetTweenType(gfx::Tween::SMOOTH_IN_OUT);
   button->layer()->SetTransform(ComputeTransformFor(button));
   bool button_is_enabled =
       (button == close_.get() && IsActionEnabled(ACTION_TYPE_CLOSE)) ||
       (button == split_.get() && IsActionEnabled(ACTION_TYPE_SPLIT));
   button->layer()->SetOpacity((button_is_enabled && shown_) ? 1 : 0);
 }
 
 }  // namespace athena