diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-21 04:29:20 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-21 04:29:20 +0000 |
| commit | d7bd3e5a343acc7a5a51dd51d44f19e3abbfd41a (patch) | |
| tree | 58b9de096179d94ab1fa05470340709e76cfdf49 /chrome/browser/hang_monitor | |
| parent | ec7293192cc51edb8a89f084a165d384f5f82ab9 (diff) | |
| download | chromium_src-d7bd3e5a343acc7a5a51dd51d44f19e3abbfd41a.zip chromium_src-d7bd3e5a343acc7a5a51dd51d44f19e3abbfd41a.tar.gz chromium_src-d7bd3e5a343acc7a5a51dd51d44f19e3abbfd41a.tar.bz2 | |
Move webplugininfo.h to content/public.
BUG=237249
TBR=scottmg
Review URL: https://codereview.chromium.org/19894003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212812 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/hang_monitor')
| -rw-r--r-- | chrome/browser/hang_monitor/hung_plugin_action.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/hang_monitor/hung_plugin_action.cc b/chrome/browser/hang_monitor/hung_plugin_action.cc index 3aebbb2..cdb9e59 100644 --- a/chrome/browser/hang_monitor/hung_plugin_action.cc +++ b/chrome/browser/hang_monitor/hung_plugin_action.cc @@ -11,10 +11,10 @@ #include "chrome/browser/ui/simple_message_box.h" #include "chrome/common/logging_chrome.h" #include "content/public/browser/plugin_service.h" +#include "content/public/common/webplugininfo.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/win/hwnd_util.h" -#include "webkit/plugins/webplugininfo.h" namespace { @@ -41,7 +41,7 @@ enum GTalkPluginLogVersion { GTalkPluginLogVersion GetGTalkPluginVersion(const string16& version) { int gtalk_plugin_version = GTALK_PLUGIN_VERSION_MIN; Version plugin_version; - webkit::WebPluginInfo::CreateVersionFromString(version, &plugin_version); + content::WebPluginInfo::CreateVersionFromString(version, &plugin_version); if (plugin_version.IsValid() && plugin_version.components().size() >= 2) { gtalk_plugin_version = 10 * plugin_version.components()[0] + plugin_version.components()[1] - kGTalkPluginLogMinVersion; |