mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Add mate::TrackableObject

Browse source
This commit is contained in:
Cheng Zhao 2015-06-24 14:36:05 +08:00
parent 15f350edcb
commit 7f0658efa7
7 changed files with 95 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/api/atom_api_web_contents.h
View file

@ -8,7 +8,7 @@
#include <string>
#include <vector>
#include "atom/browser/api/event_emitter.h"
#include "atom/browser/api/trackable_object.h"
#include "atom/browser/common_web_contents_delegate.h"
#include "content/public/browser/browser_plugin_guest_delegate.h"
#include "content/public/common/favicon_url.h"
@ -46,7 +46,7 @@ struct SetSizeParams {
scoped_ptr<gfx::Size> normal_size;
};
class WebContents : public mate::EventEmitter,
class WebContents : public mate::TrackableObject,
public content::BrowserPluginGuestDelegate,
public CommonWebContentsDelegate,
public content::WebContentsObserver,