Add PluginInstaller to encapsulate information about a missing plug-in.

chrome/browser/plugin_observer.cc

 // Copyright (c) 2011 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/browser/plugin_observer.h"
 
 #include "base/bind.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/plugin_finder.h"
+#include "chrome/browser/plugin_installer.h"
 #include "chrome/browser/plugin_installer_infobar_delegate.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
+#include "content/browser/tab_contents/tab_contents_delegate.h"
 #include "content/browser/user_metrics.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "webkit/plugins/npapi/plugin_group.h"
 #include "webkit/plugins/webplugininfo.h"
 
 namespace {
 
@@ skipping 291 matching lines @@
   plugin_finder->FindPlugin(
       mime_type, lang,
       base::Bind(&PluginObserver::FoundMissingPlugin,
                  weak_ptr_factory_.GetWeakPtr(), placeholder_id, mime_type),
       base::Bind(&PluginObserver::DidNotFindMissingPlugin,
                  weak_ptr_factory_.GetWeakPtr(), placeholder_id, mime_type));
 }
 
 void PluginObserver::FoundMissingPlugin(int placeholder_id,
                                         const std::string& mime_type,
-                                        const GURL& url,
-                                        const string16& name,
-                                        bool display_url) {
-  Send(new ChromeViewMsg_FoundMissingPlugin(placeholder_id, name));
+                                        PluginInstaller* installer) {
+  Send(new ChromeViewMsg_FoundMissingPlugin(placeholder_id, installer->name()));
   InfoBarTabHelper* infobar_helper = tab_contents_->infobar_tab_helper();
   infobar_helper->AddInfoBar(new PluginInstallerInfoBarDelegate(
       infobar_helper,
-      name,
-      GURL(),  // TODO(bauerb): Get URL from JSON file.
+      installer->name(),
+      installer->help_url(),
       base::Bind(&PluginObserver::InstallMissingPlugin,
-                 weak_ptr_factory_.GetWeakPtr(), url, display_url)));
+                 weak_ptr_factory_.GetWeakPtr(), installer)));

[battre, 2011/11/30 14:10:06]

life-time issue

[Bernhard Bauer, 2011/11/30 14:29:23]

The PluginObserver is bound to the lifetime of the TabContents, so it should not
outlive the PluginInstaller.

 }
 
 void PluginObserver::DidNotFindMissingPlugin(int placeholder_id,
                                              const std::string& mime_type) {
   Send(new ChromeViewMsg_DidNotFindMissingPlugin(placeholder_id));
 }
 
-void PluginObserver::InstallMissingPlugin(const GURL& url,
-                                          bool display_url) {
-  if (display_url) {
-    tab_contents()->OpenURL(url, tab_contents()->GetURL(), NEW_FOREGROUND_TAB,
-                            content::PAGE_TRANSITION_TYPED);
+void PluginObserver::InstallMissingPlugin(PluginInstaller* installer) {
+  if (installer->url_for_display()) {
+    tab_contents()->OpenURL(installer->plugin_url(), tab_contents()->GetURL(),
+                            NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_TYPED);
   } else {
     NOTIMPLEMENTED();
   }
 }