Implement Just-In-Time Flash updates.

chrome/renderer/plugins/chrome_plugin_placeholder.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/plugins/chrome_plugin_placeholder.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/command_line.h"
@@ skipping 56 matching lines @@
       context_menu_request_id_(0),
       did_send_blocked_content_notification_(false) {
   RenderThread::Get()->AddObserver(this);
 }
 
 ChromePluginPlaceholder::~ChromePluginPlaceholder() {
   RenderThread::Get()->RemoveObserver(this);
   if (context_menu_request_id_ && render_frame())
     render_frame()->CancelContextMenu(context_menu_request_id_);
 
-#if defined(ENABLE_PLUGIN_INSTALLATION)
   if (placeholder_routing_id_ == MSG_ROUTING_NONE)
     return;
   RenderThread::Get()->RemoveRoute(placeholder_routing_id_);
+#if defined(ENABLE_PLUGIN_INSTALLATION)
   if (has_host_) {
     RenderThread::Get()->Send(new ChromeViewHostMsg_RemovePluginPlaceholderHost(
         routing_id(), placeholder_routing_id_));
   }
 #endif
 }
 
 // static
 bool ChromePluginPlaceholder::IsSmallContentFilterEnabled() {
   return base::FeatureList::IsEnabled(features::kBlockSmallContent);
@@ skipping 77 matching lines @@
       power_saver_info.blocked_for_background_tab);
 
   return blocked_plugin;
 }
 
 void ChromePluginPlaceholder::SetStatus(
     ChromeViewHostMsg_GetPluginInfo_Status status) {
   status_ = status;
 }
 
-#if defined(ENABLE_PLUGIN_INSTALLATION)
 int32_t ChromePluginPlaceholder::CreateRoutingId() {
   placeholder_routing_id_ = RenderThread::Get()->GenerateRoutingID();
   RenderThread::Get()->AddRoute(placeholder_routing_id_, this);
   return placeholder_routing_id_;
 }
-#endif
 
 bool ChromePluginPlaceholder::OnMessageReceived(const IPC::Message& message) {
+  bool handled = true;
 #if defined(ENABLE_PLUGIN_INSTALLATION)
-  bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ChromePluginPlaceholder, message)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_FoundMissingPlugin, OnFoundMissingPlugin)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_DidNotFindMissingPlugin,
                         OnDidNotFindMissingPlugin)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_StartedDownloadingPlugin,
                         OnStartedDownloadingPlugin)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_FinishedDownloadingPlugin,
                         OnFinishedDownloadingPlugin)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_ErrorDownloadingPlugin,
                         OnErrorDownloadingPlugin)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_CancelledDownloadingPlugin,
                         OnCancelledDownloadingPlugin)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   if (handled)
     return true;
 #endif
 
+  handled = true;
+  IPC_BEGIN_MESSAGE_MAP(ChromePluginPlaceholder, message)
+    IPC_MESSAGE_HANDLER(ChromeViewMsg_PluginComponentUpdateDownloading,

[Bernhard Bauer, 2016/07/28 10:25:10]

Couldn't you merge these message handlers into the block above? Just keep the
messages that are only defined with ENABLE_PLUGIN_INSTALLATION inside of the
#ifdef block. 

[waffles, 2016/07/28 20:06:27]

Done.

+                        OnPluginComponentUpdateDownloading)
+    IPC_MESSAGE_HANDLER(ChromeViewMsg_PluginComponentUpdateSuccess,
+                        OnPluginComponentUpdateSuccess)
+    IPC_MESSAGE_HANDLER(ChromeViewMsg_PluginComponentUpdateFailure,
+                        OnPluginComponentUpdateFailure)
+    IPC_MESSAGE_UNHANDLED(handled = false)
+  IPC_END_MESSAGE_MAP()
+
+  if (handled)
+    return true;
+
   // We don't swallow these messages because multiple blocked plugins and other
   // objects have an interest in them.
   IPC_BEGIN_MESSAGE_MAP(ChromePluginPlaceholder, message)
     IPC_MESSAGE_HANDLER(PrerenderMsg_SetIsPrerendering, OnSetIsPrerendering)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_LoadBlockedPlugins, OnLoadBlockedPlugins)
   IPC_END_MESSAGE_MAP()
 
   return false;
 }
 
@@ skipping 32 matching lines @@
   SetMessage(l10n_util::GetStringFUTF16(IDS_PLUGIN_DOWNLOAD_ERROR,
                                         base::UTF8ToUTF16(error)));
 }
 
 void ChromePluginPlaceholder::OnCancelledDownloadingPlugin() {
   SetMessage(
       l10n_util::GetStringFUTF16(IDS_PLUGIN_DOWNLOAD_CANCELLED, plugin_name_));
 }
 #endif  // defined(ENABLE_PLUGIN_INSTALLATION)
 
+void ChromePluginPlaceholder::OnPluginComponentUpdateDownloading() {
+  SetMessage(l10n_util::GetStringFUTF16(IDS_PLUGIN_DOWNLOADING, plugin_name_));
+}
+
+void ChromePluginPlaceholder::OnPluginComponentUpdateSuccess() {
+  PluginListChanged();
+}
+
+void ChromePluginPlaceholder::OnPluginComponentUpdateFailure() {
+  SetMessage(l10n_util::GetStringFUTF16(IDS_PLUGIN_DOWNLOAD_ERROR_SHORT,
+                                        plugin_name_));
+}
+
 void ChromePluginPlaceholder::PluginListChanged() {
   if (!GetFrame() || !plugin())
     return;
 
   ChromeViewHostMsg_GetPluginInfo_Output output;
   std::string mime_type(GetPluginParams().mimeType.utf8());
   blink::WebString top_origin =
       GetFrame()->top()->getSecurityOrigin().toString();
   render_frame()->Send(
       new ChromeViewHostMsg_GetPluginInfo(routing_id(),
@@ skipping 127 matching lines @@
 
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnablePluginPlaceholderTesting)) {
     builder.SetMethod<void (ChromePluginPlaceholder::*)()>(
         "didFinishIconRepositionForTesting",
         &ChromePluginPlaceholder::DidFinishIconRepositionForTestingCallback);
   }
 
   return builder;
 }