Commit af551a68 authored by jochen@chromium.org's avatar jochen@chromium.org

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
parent a2019c5d
...@@ -254,6 +254,7 @@ ...@@ -254,6 +254,7 @@
'<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
], ],
}, },
'inputs': [ 'inputs': [
......
...@@ -9,6 +9,7 @@ include_rules = [ ...@@ -9,6 +9,7 @@ include_rules = [
"+content/public", "+content/public",
# The content_shell is an embedder so it must work with resource bundles. # The content_shell is an embedder so it must work with resource bundles.
"+ui/base/l10n",
"+ui/base/resource", "+ui/base/resource",
# Shell resources # Shell resources
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include "content/shell/shell_content_client.h" #include "content/shell/shell_content_client.h"
#include "base/string_piece.h" #include "base/string_piece.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h" #include "ui/base/resource/resource_bundle.h"
#include "webkit/glue/user_agent.h" #include "webkit/glue/user_agent.h"
...@@ -20,6 +21,10 @@ std::string ShellContentClient::GetUserAgent() const { ...@@ -20,6 +21,10 @@ std::string ShellContentClient::GetUserAgent() const {
return webkit_glue::BuildUserAgentFromProduct("Chrome/19.77.34.5"); 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( base::StringPiece ShellContentClient::GetDataResource(
int resource_id, int resource_id,
ui::ScaleFactor scale_factor) const { ui::ScaleFactor scale_factor) const {
......
...@@ -18,6 +18,7 @@ class ShellContentClient : public ContentClient { ...@@ -18,6 +18,7 @@ class ShellContentClient : public ContentClient {
virtual ~ShellContentClient(); virtual ~ShellContentClient();
virtual std::string GetUserAgent() const OVERRIDE; virtual std::string GetUserAgent() const OVERRIDE;
virtual string16 GetLocalizedString(int message_id) const OVERRIDE;
virtual base::StringPiece GetDataResource( virtual base::StringPiece GetDataResource(
int resource_id, int resource_id,
ui::ScaleFactor scale_factor) const OVERRIDE; ui::ScaleFactor scale_factor) const OVERRIDE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment