← Back to branch summary

~osomon/oxide/i18n

« back to all changes in this revision

Viewing changes to shared/common/oxide_content_client.cc

  • Committer: Olivier Tilloy
  • Date: 2014-04-08 10:03:11 UTC
  • mfrom: (312.2.173 oxide)
  • Revision ID: olivier.tilloy@canonical.com-20140408100311-b3zb7q1jfrevbrf1
Merge the latest changes from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
shared/common/oxide_content_client.cc
32
32
ContentClient* g_inst;
33
33
}
34
34
 
 
35
std::string ContentClient::GetUserAgent() const {
 
36
  return content::BuildUserAgentFromProduct(
 
37
      base::StringPrintf("Chrome/%s", CHROME_VERSION_STRING));
 
38
}
 
39
 
 
40
base::string16 ContentClient::GetLocalizedString(int message_id) const {
 
41
  return base::UTF8ToUTF16(localized_message_from_id(message_id));
 
42
}
 
43
 
35
44
ContentClient::ContentClient() {
36
45
  DCHECK(!g_inst);
37
46
  g_inst = this;
58
67
      content::ContentClient::renderer());
59
68
}
60
69
 
61
 
std::string ContentClient::GetUserAgent() const {
62
 
  return content::BuildUserAgentFromProduct(
63
 
      base::StringPrintf("Chrome/%s", CHROME_VERSION_STRING));
64
 
}
65
 
 
66
 
base::string16 ContentClient::GetLocalizedString(int message_id) const {
67
 
  return base::UTF8ToUTF16(localized_message_from_id(message_id));
68
 
}
69
 
 
70
70
} // namespace oxide