diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-31 16:44:03 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-31 16:44:03 +0000 |
| commit | af551a6809de1b3554f2938dab0736c356048e36 (patch) | |
| tree | 4e1e3b1475d0d316c21c85c8b04f12aa709604c5 | |
| parent | a2019c5d8a62e9f00cc4c2f120aa25ffd97b4097 (diff) | |
| download | chromium_src-af551a6809de1b3554f2938dab0736c356048e36.zip chromium_src-af551a6809de1b3554f2938dab0736c356048e36.tar.gz chromium_src-af551a6809de1b3554f2938dab0736c356048e36.tar.bz2 | |
Include webkit strings in the content shell package
BUG=none
TEST=happier dominic
Review URL: https://chromiumcodereview.appspot.com/10824111
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149203 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/content_shell.gypi | 1 | ||||
| -rw-r--r-- | content/shell/DEPS | 1 | ||||
| -rw-r--r-- | content/shell/shell_content_client.cc | 5 | ||||
| -rw-r--r-- | content/shell/shell_content_client.h | 1 |
4 files changed, 8 insertions, 0 deletions
diff --git a/content/content_shell.gypi b/content/content_shell.gypi index cfb8b42..cd57406 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -254,6 +254,7 @@ '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak', ], }, 'inputs': [ diff --git a/content/shell/DEPS b/content/shell/DEPS index 28d220d..99f80b46 100644 --- a/content/shell/DEPS +++ b/content/shell/DEPS @@ -9,6 +9,7 @@ include_rules = [ "+content/public", # The content_shell is an embedder so it must work with resource bundles. + "+ui/base/l10n", "+ui/base/resource", # Shell resources diff --git a/content/shell/shell_content_client.cc b/content/shell/shell_content_client.cc index 963d80c..e4d7a51 100644 --- a/content/shell/shell_content_client.cc +++ b/content/shell/shell_content_client.cc @@ -5,6 +5,7 @@ #include "content/shell/shell_content_client.h" #include "base/string_piece.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "webkit/glue/user_agent.h" @@ -20,6 +21,10 @@ std::string ShellContentClient::GetUserAgent() const { return webkit_glue::BuildUserAgentFromProduct("Chrome/19.77.34.5"); } +string16 ShellContentClient::GetLocalizedString(int message_id) const { + return l10n_util::GetStringUTF16(message_id); +} + base::StringPiece ShellContentClient::GetDataResource( int resource_id, ui::ScaleFactor scale_factor) const { diff --git a/content/shell/shell_content_client.h b/content/shell/shell_content_client.h index 09b0267..578dddb 100644 --- a/content/shell/shell_content_client.h +++ b/content/shell/shell_content_client.h @@ -18,6 +18,7 @@ class ShellContentClient : public ContentClient { virtual ~ShellContentClient(); virtual std::string GetUserAgent() const OVERRIDE; + virtual string16 GetLocalizedString(int message_id) const OVERRIDE; virtual base::StringPiece GetDataResource( int resource_id, ui::ScaleFactor scale_factor) const OVERRIDE; |