diff options
Diffstat (limited to 'remoting/host/plugin/host_script_object.cc')
-rw-r--r-- | remoting/host/plugin/host_script_object.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/remoting/host/plugin/host_script_object.cc b/remoting/host/plugin/host_script_object.cc index 0d4bb3b..288b240 100644 --- a/remoting/host/plugin/host_script_object.cc +++ b/remoting/host/plugin/host_script_object.cc @@ -937,14 +937,15 @@ void HostNPScriptObject::LocalizeStrings(NPObject* localize_func) { // Reload resources for the current locale. The default UI locale is used on // Windows. #if !defined(OS_WIN) - string16 ui_locale; + base::string16 ui_locale; LocalizeString(localize_func, "@@ui_locale", &ui_locale); remoting::LoadResources(UTF16ToUTF8(ui_locale)); #endif // !defined(OS_WIN) } bool HostNPScriptObject::LocalizeString(NPObject* localize_func, - const char* tag, string16* result) { + const char* tag, + base::string16* result) { return LocalizeStringWithSubstitution(localize_func, tag, NULL, result); } @@ -952,7 +953,7 @@ bool HostNPScriptObject::LocalizeStringWithSubstitution( NPObject* localize_func, const char* tag, const char* substitution, - string16* result) { + base::string16* result) { int argc = substitution ? 2 : 1; scoped_ptr<NPVariant[]> args(new NPVariant[argc]); STRINGZ_TO_NPVARIANT(tag, args[0]); |