Commit a06ba1d2 authored by Michael Spang's avatar Michael Spang Committed by Commit Bot

chromecast: Restore CastContentClient::GetDataResourceBytes

Since 7c48a707 ("Compression of IDR_SECURITY_INTERSTITIAL_HTML and
modified compression function.") cast devices fail to boot in a crash
loop since CastContentClient::GetDataResourceBytes was removed
incorrectly. Add it back.

Bug: b/139161866
Test: boot

Change-Id: Iaaa5ac6a66823fbe0bc7df0132d56d66f0983712
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1776725Reviewed-by: default avatarLuke Halliwell <halliwell@chromium.org>
Commit-Queue: Michael Spang <spang@chromium.org>
Auto-Submit: Michael Spang <spang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#692127}
parent 69cd05f2
...@@ -124,6 +124,12 @@ base::StringPiece CastContentClient::GetDataResource( ...@@ -124,6 +124,12 @@ base::StringPiece CastContentClient::GetDataResource(
resource_id, scale_factor); resource_id, scale_factor);
} }
base::RefCountedMemory* CastContentClient::GetDataResourceBytes(
int resource_id) {
return ui::ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
resource_id);
}
gfx::Image& CastContentClient::GetNativeImageNamed(int resource_id) { gfx::Image& CastContentClient::GetNativeImageNamed(int resource_id) {
return ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed( return ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
resource_id); resource_id);
......
...@@ -24,6 +24,7 @@ class CastContentClient : public content::ContentClient { ...@@ -24,6 +24,7 @@ class CastContentClient : public content::ContentClient {
base::string16 GetLocalizedString(int message_id) override; base::string16 GetLocalizedString(int message_id) override;
base::StringPiece GetDataResource(int resource_id, base::StringPiece GetDataResource(int resource_id,
ui::ScaleFactor scale_factor) override; ui::ScaleFactor scale_factor) override;
base::RefCountedMemory* GetDataResourceBytes(int resource_id) override;
gfx::Image& GetNativeImageNamed(int resource_id) override; gfx::Image& GetNativeImageNamed(int resource_id) override;
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
::media::MediaDrmBridgeClient* GetMediaDrmBridgeClient() override; ::media::MediaDrmBridgeClient* GetMediaDrmBridgeClient() 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