Uses string16 for ActivityViewModel::GetTitle()

BUG=381858
R=oshima@chromium.org
TEST=compile succeeds

Review URL: https://codereview.chromium.org/322553004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275708 0039d316-1c4b-4281-b951-d872f2087c98

athena/activity/activity_view_manager_impl.cc

@@ -10,7 +10,6 @@
 #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"
@@ -59,8 +58,7 @@ class ActivityWidget : public views::LayoutManager {
   }
 
   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));

athena/activity/public/activity_view_model.h

@@ -5,9 +5,8 @@
 #ifndef ATHENA_ACTIVITY_PUBLIC_ACTIVITY_VIEW_MODEL_H_
 #define ATHENA_ACTIVITY_PUBLIC_ACTIVITY_VIEW_MODEL_H_
 
-#include <string>
-
 #include "athena/athena_export.h"
+#include "base/strings/string16.h"
 
 typedef unsigned int SkColor;
 
@@ -25,7 +24,7 @@ class ATHENA_EXPORT ActivityViewModel {
   virtual SkColor GetRepresentativeColor() = 0;
 
   // Returns a title for the activity.
-  virtual std::string GetTitle() = 0;
+  virtual base::string16 GetTitle() = 0;
 
   // Returns the contents view.
   virtual views::View* GetContentsView() = 0;

athena/content/web_activity.cc

@@ -5,7 +5,6 @@
 #include "athena/content/web_activity.h"
 
 #include "athena/activity/public/activity_manager.h"
-#include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/views/controls/webview/webview.h"
 
@@ -28,8 +27,8 @@ SkColor WebActivity::GetRepresentativeColor() {
   return SK_ColorGRAY;
 }
 
-std::string WebActivity::GetTitle() {
-  return base::UTF16ToUTF8(web_view_->GetWebContents()->GetTitle());
+base::string16 WebActivity::GetTitle() {
+  return web_view_->GetWebContents()->GetTitle();
 }
 
 views::View* WebActivity::GetContentsView() {

athena/content/web_activity.h

@@ -32,7 +32,7 @@ class WebActivity : public Activity,
 
   // ActivityViewModel:
   virtual SkColor GetRepresentativeColor() OVERRIDE;
-  virtual std::string GetTitle() OVERRIDE;
+  virtual base::string16 GetTitle() OVERRIDE;
   virtual views::View* GetContentsView() OVERRIDE;
 
   // content::WebContentsObserver:

athena/test/sample_activity.cc

@@ -12,7 +12,7 @@ namespace test {
 
 SampleActivity::SampleActivity(SkColor color,
                                SkColor contents_color,
-                               const std::string& title)
+                               const base::string16& title)
     : color_(color),
       contents_color_(contents_color),
       title_(title),
@@ -30,7 +30,7 @@ SkColor SampleActivity::GetRepresentativeColor() {
   return color_;
 }
 
-std::string SampleActivity::GetTitle() {
+base::string16 SampleActivity::GetTitle() {
   return title_;
 }
 

athena/test/sample_activity.h

@@ -17,7 +17,7 @@ class SampleActivity : public Activity,
  public:
   SampleActivity(SkColor color,
                  SkColor contents_color,
-                 const std::string& title);
+                 const base::string16& title);
   virtual ~SampleActivity();
 
  private:
@@ -26,12 +26,12 @@ class SampleActivity : public Activity,
 
   // athena::ActivityViewModel:
   virtual SkColor GetRepresentativeColor() OVERRIDE;
-  virtual std::string GetTitle() OVERRIDE;
+  virtual base::string16 GetTitle() OVERRIDE;
   virtual views::View* GetContentsView() OVERRIDE;
 
   SkColor color_;
   SkColor contents_color_;
-  std::string title_;
+  base::string16 title_;
   views::View* contents_view_;
 
   DISALLOW_COPY_AND_ASSIGN(SampleActivity);

athena/test/sample_activity_factory.cc

@@ -7,6 +7,7 @@
 #include <string>
 
 #include "athena/test/sample_activity.h"
+#include "base/strings/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "url/gurl.h"
 
@@ -26,7 +27,7 @@ Activity* SampleActivityFactory::CreateWebActivity(
     content::BrowserContext* browser_context,
     const GURL& url) {
   return new SampleActivity(
-      kDefaultColor, kDefaultContentColor, url.spec());
+      kDefaultColor, kDefaultContentColor, base::UTF8ToUTF16(url.spec()));
 }
 
 }  // namespace test