Move webplugininfo.h to content/public.

chrome/browser/ui/webui/flash_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/flash_ui.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
@@ skipping 15 matching lines @@
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/browser/gpu_data_manager_observer.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/browser/web_ui_message_handler.h"
+#include "content/public/common/webplugininfo.h"
 #include "gpu/config/gpu_info.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "webkit/plugins/plugin_constants.h"
-#include "webkit/plugins/webplugininfo.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 using content::GpuDataManager;
 using content::PluginService;
 using content::UserMetricsAction;
 using content::WebContents;
 using content::WebUIMessageHandler;
@@ skipping 37 matching lines @@
   // CrashUploadList::Delegate implementation.
   virtual void OnUploadListAvailable() OVERRIDE;
 
   // GpuDataManager::Observer implementation.
   virtual void OnGpuInfoUpdate() OVERRIDE;
 
   // Callback for the "requestFlashInfo" message.
   void HandleRequestFlashInfo(const ListValue* args);
 
   // Callback for the Flash plugin information.
-  void OnGotPlugins(const std::vector<webkit::WebPluginInfo>& plugins);
+  void OnGotPlugins(const std::vector<content::WebPluginInfo>& plugins);
 
  private:
   // Called when we think we might have enough information to return data back
   // to the page.
   void MaybeRespondToPage();
 
   // In certain cases we might not get called back from the GPU process so we
   // set an upper limit on the time we wait. This function gets called when the
   // time has passed. This actually doesn't prevent the rest of the information
   // to appear later, the page will just reflow when more information becomes
@@ skipping 83 matching lines @@
   page_has_requested_data_ = true;
   MaybeRespondToPage();
 }
 
 void FlashDOMHandler::OnGpuInfoUpdate() {
   has_gpu_info_ = true;
   MaybeRespondToPage();
 }
 
 void FlashDOMHandler::OnGotPlugins(
-    const std::vector<webkit::WebPluginInfo>& plugins) {
+    const std::vector<content::WebPluginInfo>& plugins) {
   has_plugin_info_ = true;
   MaybeRespondToPage();
 }
 
 void FlashDOMHandler::OnTimeout() {
   // We don't set page_has_requested_data_ because that is guaranteed to appear
   // and we shouldn't be responding to the page before then.
   has_gpu_info_ = true;
   crash_list_available_ = true;
   has_plugin_info_ = true;
@@ skipping 42 matching lines @@
   }
   os_label += " SP" + base::IntToString(os->service_pack().major);
   if (os->service_pack().minor > 0)
     os_label += "." + base::IntToString(os->service_pack().minor);
   if (os->architecture() == base::win::OSInfo::X64_ARCHITECTURE)
     os_label += " 64 bit";
 #endif
   AddPair(list, l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_OS), os_label);
 
   // Obtain the version of the Flash plugins.
-  std::vector<webkit::WebPluginInfo> info_array;
+  std::vector<content::WebPluginInfo> info_array;
   PluginService::GetInstance()->GetPluginInfoArray(
       GURL(), kFlashPluginSwfMimeType, false, &info_array, NULL);
   if (info_array.empty()) {
     AddPair(list, ASCIIToUTF16(kFlashPlugin), "Not installed");
   } else {
     PluginPrefs* plugin_prefs =
         PluginPrefs::GetForProfile(Profile::FromWebUI(web_ui())).get();
     bool found_enabled = false;
     for (size_t i = 0; i < info_array.size(); ++i) {
       string16 flash_version = info_array[i].version + ASCIIToUTF16(" ") +
@@ skipping 110 matching lines @@
   Profile* profile = Profile::FromWebUI(web_ui);
   content::WebUIDataSource::Add(profile, CreateFlashUIHTMLSource());
 }
 
 // static
 base::RefCountedMemory* FlashUI::GetFaviconResourceBytes(
       ui::ScaleFactor scale_factor) {
   // Use the default icon for now.
   return NULL;
 }