Commit b9e27051 authored by Kristian Kirs's avatar Kristian Kirs Committed by Commit Bot

[DevTools] Replace usages of GetRawDataResource

GetRawDataResource assumes that underlying files are not compressed,
whereas LoadDataResourceString automatically decompresses if necessary.

Bug: 1068407
Change-Id: I03b5833fb245460d60a3206985cc905efdbf6cd2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2270225Reviewed-by: default avatardpapad <dpapad@chromium.org>
Reviewed-by: default avatarCharlie Reis <creis@chromium.org>
Reviewed-by: default avatarScott Violet <sky@chromium.org>
Commit-Queue: Charlie Reis <creis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#786290}
parent 7ed16895
...@@ -62,9 +62,8 @@ std::string CastDevToolsManagerDelegate::GetDiscoveryPageHTML() { ...@@ -62,9 +62,8 @@ std::string CastDevToolsManagerDelegate::GetDiscoveryPageHTML() {
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
return std::string(); return std::string();
#else #else
return ui::ResourceBundle::GetSharedInstance() return ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
.GetRawDataResource(IDR_CAST_SHELL_DEVTOOLS_DISCOVERY_PAGE) IDR_CAST_SHELL_DEVTOOLS_DISCOVERY_PAGE);
.as_string();
#endif #endif
} }
......
...@@ -208,9 +208,8 @@ std::string ShellDevToolsManagerDelegate::GetDiscoveryPageHTML() { ...@@ -208,9 +208,8 @@ std::string ShellDevToolsManagerDelegate::GetDiscoveryPageHTML() {
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
return std::string(); return std::string();
#else #else
return ui::ResourceBundle::GetSharedInstance() return ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
.GetRawDataResource(IDR_CONTENT_SHELL_DEVTOOLS_DISCOVERY_PAGE) IDR_CONTENT_SHELL_DEVTOOLS_DISCOVERY_PAGE);
.as_string();
#endif #endif
} }
......
...@@ -48,9 +48,8 @@ HeadlessDevToolsManagerDelegate::CreateNewTarget(const GURL& url) { ...@@ -48,9 +48,8 @@ HeadlessDevToolsManagerDelegate::CreateNewTarget(const GURL& url) {
} }
std::string HeadlessDevToolsManagerDelegate::GetDiscoveryPageHTML() { std::string HeadlessDevToolsManagerDelegate::GetDiscoveryPageHTML() {
return ui::ResourceBundle::GetSharedInstance() return ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
.GetRawDataResource(IDR_HEADLESS_LIB_DEVTOOLS_DISCOVERY_PAGE) IDR_HEADLESS_LIB_DEVTOOLS_DISCOVERY_PAGE);
.as_string();
} }
bool HeadlessDevToolsManagerDelegate::HasBundledFrontendResources() { bool HeadlessDevToolsManagerDelegate::HasBundledFrontendResources() {
......
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