Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(650)

Unified Diff: chrome/common/chrome_content_client.cc

Issue 2284053002: Register a fake Flash with chrome://plugins during browser start-up. (Closed)
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/common/chrome_content_client.cc
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
index 4325cec4d950d46fc8cc2f81088fc2a2b0bf0ac2..483c3c85ea823bb6b1260f7b3e1fab8ea3f2b92b 100644
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -6,6 +6,7 @@
#include <stdint.h>
+#include <map>
Will Harris 2016/08/26 22:52:35 unneeded?
waffles 2016/08/26 23:10:04 Same deal, used on 501, decided to include it whil
#include <memory>
#include <tuple>
@@ -551,8 +552,20 @@ void ChromeContentClient::AddPepperPlugins(
// This function will return only the most recent version of the flash plugin.
content::PepperPluginInfo* max_flash =
FindMostRecentPlugin(flash_versions.get());
- if (max_flash)
+ if (max_flash) {
plugins->push_back(*max_flash);
+ } else {
+#if defined(GOOGLE_CHROME_BUILD) && defined(FLAPPER_AVAILABLE)
+ // Add a fake Flash plugin even though it doesn't actually exist - if a
+ // web page requests it, it will be component-updated on-demand. There is
+ // nothing that guarantees the component update will give us the
+ // FLAPPER_VERSION_STRING version of Flash, but using this version seems
+ // better than any other hardcoded alternative.
+ plugins->push_back(CreatePepperFlashInfo(
+ base::FilePath::FromUTF8Unsafe(ChromeContentClient::kNotPresent),
+ FLAPPER_VERSION_STRING, false, false, true));
+#endif // defined(GOOGLE_CHROME_BUILD) && defined(FLAPPER_AVAILABLE)
+ }
#endif // defined(ENABLE_PLUGINS)
}

Powered by Google App Engine
This is Rietveld 408576698