Update to Chromium revision 213078.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1338 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-07-24 20:15:18 +00:00
parent 6a7353be3e
commit a2a3513620
69 changed files with 510 additions and 444 deletions

View File

@ -7,11 +7,11 @@
#pragma once
#include "include/cef_web_plugin.h"
#include "webkit/plugins/webplugininfo.h"
#include "content/public/common/webplugininfo.h"
class CefWebPluginInfoImpl : public CefWebPluginInfo {
public:
explicit CefWebPluginInfoImpl(const webkit::WebPluginInfo& plugin_info);
explicit CefWebPluginInfoImpl(const content::WebPluginInfo& plugin_info);
virtual CefString GetName() OVERRIDE;
virtual CefString GetPath() OVERRIDE;
@ -19,7 +19,7 @@ class CefWebPluginInfoImpl : public CefWebPluginInfo {
virtual CefString GetDescription() OVERRIDE;
private:
webkit::WebPluginInfo plugin_info_;
content::WebPluginInfo plugin_info_;
IMPLEMENT_REFCOUNTING(CefWebPluginInfoImpl);
};