Add ppapi plugins to about:plugins

webkit/glue/plugins/webplugin_impl.cc

 // Copyright (c) 2010 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 "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/rect.h"
 #include "net/base/escape.h"
@@ skipping 190 matching lines @@
 }
 
 }  // namespace
 
 // WebKit::WebPlugin ----------------------------------------------------------
 
 bool WebPluginImpl::initialize(WebPluginContainer* container) {
   if (!page_delegate_)
     return false;
 
-  std::string actual_mime_type;
   WebPluginDelegate* plugin_delegate = page_delegate_->CreatePluginDelegate(
-      plugin_url_, mime_type_, &actual_mime_type);
+      file_path_, mime_type_);
   if (!plugin_delegate)
-    return NULL;
+    return false;
 
   // Set the container before Initialize because the plugin may
   // synchronously call NPN_GetValue to get its container during its
   // initialization.
   SetContainer(container);
   bool ok = plugin_delegate->Initialize(
       plugin_url_, arg_names_, arg_values_, this, load_manually_);
   if (!ok) {
     plugin_delegate->PluginDestroyed();
     return false;
   }
 
-  if (!actual_mime_type.empty())
-    mime_type_ = actual_mime_type;
   delegate_ = plugin_delegate;
 
   return true;
 }
 
 void WebPluginImpl::destroy() {
   SetContainer(NULL);
   MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }
 
@@ skipping 162 matching lines @@
 
 void WebPluginImpl::printEnd() {
   if (delegate_)
     delegate_->PrintEnd();
 }
 
 
 // -----------------------------------------------------------------------------
 
 WebPluginImpl::WebPluginImpl(
-    WebFrame* webframe, const WebPluginParams& params,
+    WebFrame* webframe,
+    const WebPluginParams& params,
+    const FilePath& file_path,
+    const std::string& mime_type,
     const base::WeakPtr<WebPluginPageDelegate>& page_delegate)
     : windowless_(false),
       window_(gfx::kNullPluginWindow),
       accepts_input_events_(false),
       page_delegate_(page_delegate),
       webframe_(webframe),
       delegate_(NULL),
       container_(NULL),
       plugin_url_(params.url),
       load_manually_(params.loadManually),
       first_geometry_update_(true),
       ignore_response_error_(false),
-      mime_type_(params.mimeType.utf8()),
+      file_path_(file_path),
+      mime_type_(mime_type),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
   DCHECK_EQ(params.attributeNames.size(), params.attributeValues.size());
   StringToLowerASCII(&mime_type_);
 
   for (size_t i = 0; i < params.attributeNames.size(); ++i) {
     arg_names_.push_back(params.attributeNames[i].utf8());
     arg_values_.push_back(params.attributeValues[i].utf8());
   }
 }
 
@@ skipping 705 matching lines @@
     return false;
 
   WebPluginContainer* container_widget = container_;
 
   // Destroy the current plugin instance.
   TearDownPluginInstance(loader);
 
   container_ = container_widget;
   webframe_ = webframe;
 
-  std::string actual_mime_type;
   WebPluginDelegate* plugin_delegate = page_delegate_->CreatePluginDelegate(
-      plugin_url_, mime_type_, &actual_mime_type);
+      file_path_, mime_type_);
 
-  bool ok = plugin_delegate->Initialize(
+  bool ok = plugin_delegate && plugin_delegate->Initialize(
       plugin_url_, arg_names_, arg_values_, this, load_manually_);
 
   if (!ok) {
     container_ = NULL;
     // TODO(iyengar) Should we delete the current plugin instance here?
     return false;
   }
 
-  mime_type_ = actual_mime_type;
   delegate_ = plugin_delegate;
 
   // Force a geometry update to occur to ensure that the plugin becomes
   // visible.
   container_->reportGeometry();
 
   // The plugin move sequences accumulated via DidMove are sent to the browser
   // whenever the renderer paints. Force a paint here to ensure that changes
   // to the plugin window are propagated to the browser.
   container_->invalidate();
@@ skipping 57 matching lines @@
 WebDevToolsAgent* WebPluginImpl::GetDevToolsAgent() {
   if (!webframe_)
     return NULL;
   WebView* view = webframe_->view();
   if (!view)
     return NULL;
   return view->devToolsAgent();
 }
 
 }  // namespace webkit_glue