Move webplugininfo.h to content/public.

chrome/browser/ui/webui/plugins_ui.cc

 // Copyright (c) 2012 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/ui/webui/plugins_ui.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 34 matching lines @@
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/ui/webui/chromeos/ui_account_tweaks.h"
 #endif
 
 using content::PluginService;
 using content::WebContents;
+using content::WebPluginInfo;
 using content::WebUIMessageHandler;
-using webkit::WebPluginInfo;
 
 namespace {
 
 // Callback function to process result of EnablePlugin method.
 void AssertPluginEnabled(bool did_enable) {
   DCHECK(did_enable);
 }
 
 content::WebUIDataSource* CreatePluginsUIHTMLSource() {
   content::WebUIDataSource* source =
@@ skipping 93 matching lines @@
 
   // content::NotificationObserver method overrides
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
  private:
   void LoadPlugins();
 
   // Called on the UI thread when the plugin information is ready.
-  void PluginsLoaded(const std::vector<webkit::WebPluginInfo>& plugins);
+  void PluginsLoaded(const std::vector<WebPluginInfo>& plugins);
 
   content::NotificationRegistrar registrar_;
 
   base::WeakPtrFactory<PluginsDOMHandler> weak_ptr_factory_;
 
   // Holds grouped plug-ins. The key is the group identifier and
   // the value is the list of plug-ins belonging to the group.
   typedef base::hash_map<std::string, std::vector<const WebPluginInfo*> >
       PluginGroups;
 
@@ skipping 141 matching lines @@
 void PluginsDOMHandler::LoadPlugins() {
   if (weak_ptr_factory_.HasWeakPtrs())
     return;
 
   PluginService::GetInstance()->GetPlugins(
       base::Bind(&PluginsDOMHandler::PluginsLoaded,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void PluginsDOMHandler::PluginsLoaded(
-    const std::vector<webkit::WebPluginInfo>& plugins) {
+    const std::vector<WebPluginInfo>& plugins) {
   Profile* profile = Profile::FromWebUI(web_ui());
   PluginPrefs* plugin_prefs = PluginPrefs::GetForProfile(profile).get();
 
   ContentSettingsPattern wildcard = ContentSettingsPattern::Wildcard();
 
   PluginFinder* plugin_finder = PluginFinder::GetInstance();
   // Group plug-ins by identifier. This is done to be able to display
   // the plug-ins in UI in a grouped fashion.
   PluginGroups groups;
   for (size_t i = 0; i < plugins.size(); ++i) {
@@ skipping 21 matching lines @@
       const WebPluginInfo& group_plugin = *group_plugins[j];
 
       DictionaryValue* plugin_file = new DictionaryValue();
       plugin_file->SetString("name", group_plugin.name);
       plugin_file->SetString("description", group_plugin.desc);
       plugin_file->SetString("path", group_plugin.path.value());
       plugin_file->SetString("version", group_plugin.version);
       plugin_file->SetString("type", PluginTypeToString(group_plugin.type));
 
       ListValue* mime_types = new ListValue();
-      const std::vector<webkit::WebPluginMimeType>& plugin_mime_types =
+      const std::vector<content::WebPluginMimeType>& plugin_mime_types =
           group_plugin.mime_types;
       for (size_t k = 0; k < plugin_mime_types.size(); ++k) {
         DictionaryValue* mime_type = new DictionaryValue();
         mime_type->SetString("mimeType", plugin_mime_types[k].mime_type);
         mime_type->SetString("description", plugin_mime_types[k].description);
 
         ListValue* file_extensions = new ListValue();
         const std::vector<std::string>& mime_file_extensions =
             plugin_mime_types[k].file_extensions;
         for (size_t l = 0; l < mime_file_extensions.size(); ++l)
@@ skipping 109 matching lines @@
 void PluginsUI::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
       prefs::kPluginsShowDetails,
       false,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterDictionaryPref(
       prefs::kContentSettingsPluginWhitelist,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 }