Update to Chromium version 21.0.1180.91

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1180@793 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2012-09-24 17:32:34 +00:00
parent a080d1ce6d
commit d8ec4a25ff
4 changed files with 15 additions and 5 deletions

View File

@ -16,5 +16,5 @@
# http://dev.chromium.org/developers/how-tos/get-the-code
{
'release_url': 'http://src.chromium.org/svn/releases/21.0.1180.18',
'release_url': 'http://src.chromium.org/svn/releases/21.0.1180.91',
}

View File

@ -91,6 +91,15 @@ base::StringPiece CefContentClient::GetDataResource(
return value;
}
gfx::Image& CefContentClient::GetNativeImageNamed(int resource_id) const {
gfx::Image& value =
ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id);
if (value.IsEmpty())
LOG(ERROR) << "No native image available for id " << resource_id;
return value;
}
FilePath CefContentClient::GetPathForResourcePack(
const FilePath& pack_path,
ui::ScaleFactor scale_factor) {

View File

@ -33,6 +33,7 @@ class CefContentClient : public content::ContentClient,
virtual base::StringPiece GetDataResource(
int resource_id,
ui::ScaleFactor scale_factor) const OVERRIDE;
virtual gfx::Image& GetNativeImageNamed(int resource_id) const OVERRIDE;
CefRefPtr<CefApp> application() const { return application_; }

View File

@ -1,17 +1,17 @@
Index: resource_ids
===================================================================
--- resource_ids (revision 131752)
--- resource_ids (revision 157234)
+++ resource_ids (working copy)
@@ -16,6 +16,12 @@
{
"SRCDIR": "../..",
+ "cef/libcef/resources/cef_resources.grd": {
+ "includes": [26000],
+ "includes": [27000],
+ },
+ "cef/libcef/resources/cef_strings.grd": {
+ "messages": [26500],
+ "messages": [27500],
+ },
"chrome/browser/browser_resources.grd": {
"includes": [500],
},
"structures": [750],