Make WebPluginInfo more generic

webkit/glue/webkit_glue.h

 // 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.
 
 #ifndef WEBKIT_GLUE_WEBKIT_GLUE_H_
 #define WEBKIT_GLUE_WEBKIT_GLUE_H_
 
 #include "base/basictypes.h"
 
 #if defined(OS_WIN)
@@ skipping 21 matching lines @@
 class PlatformCanvas;
 }
 
 namespace WebKit {
 class WebFrame;
 class WebString;
 class WebView;
 }
 
 namespace webkit {
-namespace npapi {
 struct WebPluginInfo;
 }
-}
 
 namespace webkit_glue {
 
 
 //---- BEGIN FUNCTIONS IMPLEMENTED BY WEBKIT/GLUE -----------------------------
 
 void SetJavaScriptFlags(const std::string& flags);
 
 // Turn on logging for flags in the provided comma delimited list.
 void EnableWebCoreLogChannels(const std::string& channels);
@@ skipping 147 matching lines @@
 
 // Get a sequence number which uniquely identifies clipboard state.
 uint64 ClipboardGetSequenceNumber();
 
 // Reads filenames from the clipboard, if available.
 bool ClipboardReadFilenames(ui::Clipboard::Buffer buffer,
                             std::vector<string16>* filenames);
 
 // Embedders implement this function to return the list of plugins to Webkit.
 void GetPlugins(bool refresh,
-                std::vector<webkit::npapi::WebPluginInfo>* plugins);
+                std::vector<webkit::WebPluginInfo>* plugins);
 
 // Returns true if the protocol implemented to serve |url| supports features
 // required by the media engine.
 bool IsProtocolSupportedForMedia(const GURL& url);
 
 // Resolves the proxies for the url, returns true on success.
 bool FindProxyForUrl(const GURL& url, std::string* proxy_list);
 
 // Returns the locale that this instance of webkit is running as.  This is of
 // the form language-country (e.g., en-US or pt-BR).
@@ skipping 42 matching lines @@
 bool GetFontTable(int fd, uint32_t table, uint8_t* output,
                   size_t* output_length);
 #endif
 
 // ---- END FUNCTIONS IMPLEMENTED BY EMBEDDER ---------------------------------
 
 
 } // namespace webkit_glue
 
 #endif  // WEBKIT_GLUE_WEBKIT_GLUE_H_