bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 56.0.2924.51

Browse Source
This commit is contained in:
Marshall Greenblatt
2017-01-11 18:22:19 -05:00
parent e63e109489
commit 5c07d06435
10 changed files with 95 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patch/patches/webview_plugin_2020.patch
View File

@@ -1,16 +1,16 @@
diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
index 4206b74..5d6af4c 100644
index 54b8ced..aca718b 100644
--- chrome/app/generated_resources.grd
+++ chrome/app/generated_resources.grd
@@ -7199,7 +7199,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
@@ -7196,7 +7196,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
</message>
</if>
<message name="IDS_PLUGIN_BLOCKED_BY_POLICY" desc="The placeholder text for a plugin blocked by enterprise policy.">
- <ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph> is blocked by enterprise policy
+ <ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph> is not allowed
</message>
<if expr="chromeos">
<message name="IDS_NACL_PLUGIN_BLOCKED" desc="The placeholder text for a blocked plugin.">
<message name="IDS_PLUGIN_BLOCKED_NO_LOADING" desc="The placeholder text for a blocked plugin that cannot be manually loaded by the user.">
<ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph> is blocked
diff --git components/plugins/renderer/loadable_plugin_placeholder.cc components/plugins/renderer/loadable_plugin_placeholder.cc
index 1f38fdb..03e0f60 100644
--- components/plugins/renderer/loadable_plugin_placeholder.cc