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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: athena/content/web_activity.cc

Issue 322553004: Uses string16 for ActivityViewModel::GetTitle() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix typo of rebase Created 6 years, 6 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/web_activity.h ('k') | athena/test/sample_activity.h » ('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 fa7b6da24114278939c96cc0898e75c4d60b4c7a..97020f6c57334ee4dfd6fa33cab75b0a915bd73c 100644
--- a/athena/content/web_activity.cc
+++ b/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() {
« no previous file with comments | « athena/content/web_activity.h ('k') | athena/test/sample_activity.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698