From fcf75d4016c7a2dcad1d2415009eff1e0eef4468 Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Tue, 3 Dec 2013 20:11:26 +0000 Subject: Convert string16 to base::string16 in content. BUG= Review URL: https://codereview.chromium.org/102593002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238447 0039d316-1c4b-4281-b951-d872f2087c98 --- content/shell/common/shell_content_client.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'content/shell/common/shell_content_client.cc') diff --git a/content/shell/common/shell_content_client.cc b/content/shell/common/shell_content_client.cc index 495ad85..8cb0f88 100644 --- a/content/shell/common/shell_content_client.cc +++ b/content/shell/common/shell_content_client.cc @@ -29,7 +29,7 @@ std::string ShellContentClient::GetUserAgent() const { return webkit_glue::BuildUserAgentFromProduct(product); } -string16 ShellContentClient::GetLocalizedString(int message_id) const { +base::string16 ShellContentClient::GetLocalizedString(int message_id) const { if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) { switch (message_id) { case IDS_FORM_OTHER_DATE_LABEL: -- cgit v1.1