diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-14 05:24:44 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-14 05:24:44 +0000 |
| commit | 91d9f3d52a1e55a9938416b258e08d3cc445eae4 (patch) | |
| tree | 41a281011d4ba9e327fb4e167528c99e0faec018 /chrome/browser/metrics/metrics_service.cc | |
| parent | 3c8f946c38d15238f5b0793123c06859a8bc2352 (diff) | |
| download | chromium_src-91d9f3d52a1e55a9938416b258e08d3cc445eae4.zip chromium_src-91d9f3d52a1e55a9938416b258e08d3cc445eae4.tar.gz chromium_src-91d9f3d52a1e55a9938416b258e08d3cc445eae4.tar.bz2 | |
Make WebPluginInfo more generic
- To account for pepper plugins, it grows a type field
- move WebPluginInfo from webkit::npapi to webkit:: and move the files as well.
This will allow us to remove hacks to get pepper plugins to load soon
BUG=89248
TEST=none
Review URL: http://codereview.chromium.org/7648017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96718 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/metrics/metrics_service.cc')
| -rw-r--r-- | chrome/browser/metrics/metrics_service.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc index 281905b..aec969f 100644 --- a/chrome/browser/metrics/metrics_service.cc +++ b/chrome/browser/metrics/metrics_service.cc @@ -191,7 +191,7 @@ #include "content/common/child_process_info.h" #include "content/common/notification_service.h" #include "webkit/plugins/npapi/plugin_list.h" -#include "webkit/plugins/npapi/webplugininfo.h" +#include "webkit/plugins/webplugininfo.h" // TODO(port): port browser_distribution.h. #if !defined(OS_POSIX) @@ -321,7 +321,7 @@ class MetricsService::InitTaskComplete : public Task { public: explicit InitTaskComplete( const std::string& hardware_class, - const std::vector<webkit::npapi::WebPluginInfo>& plugins) + const std::vector<webkit::WebPluginInfo>& plugins) : hardware_class_(hardware_class), plugins_(plugins) {} virtual void Run() { @@ -331,7 +331,7 @@ class MetricsService::InitTaskComplete : public Task { private: std::string hardware_class_; - std::vector<webkit::npapi::WebPluginInfo> plugins_; + std::vector<webkit::WebPluginInfo> plugins_; }; class MetricsService::InitTask : public Task { @@ -340,7 +340,7 @@ class MetricsService::InitTask : public Task { : callback_loop_(callback_loop) {} virtual void Run() { - std::vector<webkit::npapi::WebPluginInfo> plugins; + std::vector<webkit::WebPluginInfo> plugins; webkit::npapi::PluginList::Singleton()->GetPlugins(&plugins); std::string hardware_class; // Empty string by default. #if defined(OS_CHROMEOS) @@ -794,7 +794,7 @@ void MetricsService::InitializeMetricsState() { void MetricsService::OnInitTaskComplete( const std::string& hardware_class, - const std::vector<webkit::npapi::WebPluginInfo>& plugins) { + const std::vector<webkit::WebPluginInfo>& plugins) { DCHECK(state_ == INIT_TASK_SCHEDULED); hardware_class_ = hardware_class; plugins_ = plugins; |