Update to Chromium revision adb61db1 (#508578)

This commit is contained in:
Marshall Greenblatt
2017-10-20 13:45:20 -04:00
parent c80264ab11
commit 8b4980b4ca
95 changed files with 647 additions and 776 deletions

View File

@ -69,7 +69,7 @@ CefPluginPlaceholder* CefPluginPlaceholder::CreateLoadableMissingPlugin(
content::RenderFrame* render_frame,
const blink::WebPluginParams& params) {
const base::StringPiece template_html(
ResourceBundle::GetSharedInstance().GetRawDataResource(
ui::ResourceBundle::GetSharedInstance().GetRawDataResource(
IDR_BLOCKED_PLUGIN_HTML));
base::DictionaryValue values;
@ -121,7 +121,7 @@ CefPluginPlaceholder* CefPluginPlaceholder::CreateBlockedPlugin(
}
const base::StringPiece template_html(
ResourceBundle::GetSharedInstance().GetRawDataResource(template_id));
ui::ResourceBundle::GetSharedInstance().GetRawDataResource(template_id));
DCHECK(!template_html.empty())
<< "unable to load template. ID: " << template_id;