Uses string16 for ActivityViewModel::GetTitle()

athena/activity/activity_view_manager_impl.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/activity/public/activity_view_manager.h"
 
 #include <algorithm>
 #include <map>
 
 #include "athena/activity/public/activity.h"
 #include "athena/activity/public/activity_view_model.h"
 #include "athena/screen/public/screen_manager.h"
-#include "base/strings/utf_string_conversions.h"
 #include "ui/aura/window.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/layout_manager.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace athena {
 namespace {
 
@@ skipping 28 matching lines @@
   }
 
   virtual ~ActivityWidget() {}
 
   void Show() {
     Update();
     widget_->Show();
   }
 
   void Update() {
-    title_->SetText(
-        base::UTF8ToUTF16(activity_->GetActivityViewModel()->GetTitle()));
+    title_->SetText(activity_->GetActivityViewModel()->GetTitle());
     SkColor bgcolor =
         activity_->GetActivityViewModel()->GetRepresentativeColor();
     title_->set_background(views::Background::CreateSolidBackground(bgcolor));
     title_->SetBackgroundColor(bgcolor);
   }
 
  private:
   // views::LayoutManager:
   virtual void Layout(views::View* host) OVERRIDE {
     CHECK_EQ(container_, host);
@@ skipping 79 matching lines @@
 ActivityViewManager* ActivityViewManager::Get() {
   return instance;
 }
 
 void ActivityViewManager::Shutdown() {
   CHECK(instance);
   delete instance;
 }
 
 }  // namespace athena