diff options
Diffstat (limited to 'chrome/browser/extensions/api')
3 files changed, 13 insertions, 13 deletions
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_api.cc b/chrome/browser/extensions/api/content_settings/content_settings_api.cc index 728e805..56631dd 100644 --- a/chrome/browser/extensions/api/content_settings/content_settings_api.cc +++ b/chrome/browser/extensions/api/content_settings/content_settings_api.cc @@ -266,11 +266,11 @@ bool ContentSettingsContentSettingGetResourceIdentifiersFunction::RunImpl() { } void ContentSettingsContentSettingGetResourceIdentifiersFunction::OnGotPlugins( - const std::vector<webkit::WebPluginInfo>& plugins) { + const std::vector<content::WebPluginInfo>& plugins) { PluginFinder* finder = PluginFinder::GetInstance(); std::set<std::string> group_identifiers; base::ListValue* list = new base::ListValue(); - for (std::vector<webkit::WebPluginInfo>::const_iterator it = plugins.begin(); + for (std::vector<content::WebPluginInfo>::const_iterator it = plugins.begin(); it != plugins.end(); ++it) { scoped_ptr<PluginMetadata> plugin_metadata(finder->GetPluginMetadata(*it)); const std::string& group_identifier = plugin_metadata->identifier(); diff --git a/chrome/browser/extensions/api/content_settings/content_settings_api.h b/chrome/browser/extensions/api/content_settings/content_settings_api.h index fcdd01f..820849f 100644 --- a/chrome/browser/extensions/api/content_settings/content_settings_api.h +++ b/chrome/browser/extensions/api/content_settings/content_settings_api.h @@ -9,7 +9,7 @@ class PluginFinder; -namespace webkit { +namespace content { struct WebPluginInfo; } @@ -67,7 +67,7 @@ class ContentSettingsContentSettingGetResourceIdentifiersFunction // Callback method that gets executed when |plugins| // are asynchronously fetched. - void OnGotPlugins(const std::vector<webkit::WebPluginInfo>& plugins); + void OnGotPlugins(const std::vector<content::WebPluginInfo>& plugins); }; } // namespace extensions diff --git a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc index f1702cc..8c3bbed 100644 --- a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc +++ b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc @@ -13,7 +13,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "content/public/browser/plugin_service.h" -#include "webkit/plugins/webplugininfo.h" +#include "content/public/common/webplugininfo.h" namespace extensions { @@ -115,16 +115,16 @@ IN_PROC_BROWSER_TEST_F(ContentSettingsGetResourceIdentifiersTest, const char* kBarName = "Bar Plugin"; content::PluginService::GetInstance()->RegisterInternalPlugin( - webkit::WebPluginInfo(ASCIIToUTF16(kFooName), - base::FilePath(kFooPath), - ASCIIToUTF16("1.2.3"), - ASCIIToUTF16("foo")), + content::WebPluginInfo(ASCIIToUTF16(kFooName), + base::FilePath(kFooPath), + ASCIIToUTF16("1.2.3"), + ASCIIToUTF16("foo")), false); content::PluginService::GetInstance()->RegisterInternalPlugin( - webkit::WebPluginInfo(ASCIIToUTF16(kBarName), - base::FilePath(kBarPath), - ASCIIToUTF16("2.3.4"), - ASCIIToUTF16("bar")), + content::WebPluginInfo(ASCIIToUTF16(kBarName), + base::FilePath(kBarPath), + ASCIIToUTF16("2.3.4"), + ASCIIToUTF16("bar")), false); EXPECT_TRUE(RunExtensionTest("content_settings/getresourceidentifiers")) |