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

Unified Diff: athena/test/sample_activity_factory.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/test/sample_activity.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/test/sample_activity_factory.cc
diff --git a/athena/test/sample_activity_factory.cc b/athena/test/sample_activity_factory.cc
index af2d1477766dc9727d61c8bfcc2a6903e5efeeed..50deaf705aeaf8d19e68a3537c59185ddebfea65 100644
--- a/athena/test/sample_activity_factory.cc
+++ b/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
« no previous file with comments | « athena/test/sample_activity.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698