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

Merge pull request #8 from aroben/atom

Browse source 
InspectableWebContents should be able to accept existing WebContents.
This commit is contained in:
Adam Roben 2013-04-22 05:47:14 -07:00
commit 7d9e271333
4 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
brightray/browser/inspectable_web_contents.cc
View file

@ -5,7 +5,11 @@
namespace brightray {
InspectableWebContents* InspectableWebContents::Create(const content::WebContents::CreateParams& create_params) {
return new InspectableWebContentsImpl(create_params);
return Create(content::WebContents::Create(create_params));
}
InspectableWebContents* InspectableWebContents::Create(content::WebContents* web_contents) {
return new InspectableWebContentsImpl(web_contents);
}
}

4
brightray/browser/inspectable_web_contents.h
View file

@ -10,6 +10,10 @@ class InspectableWebContentsView;
class InspectableWebContents {
public:
static InspectableWebContents* Create(const content::WebContents::CreateParams&);
// The returned InspectableWebContents takes ownership of the passed-in WebContents.
static InspectableWebContents* Create(content::WebContents*);
virtual ~InspectableWebContents() {}
virtual InspectableWebContentsView* GetView() const = 0;

4
brightray/browser/inspectable_web_contents_impl.cc
View file

@ -36,8 +36,8 @@ void InspectableWebContentsImpl::RegisterPrefs(PrefRegistrySimple* registry) {
registry->RegisterStringPref(kDockSidePref, "bottom");
}
InspectableWebContentsImpl::InspectableWebContentsImpl(const content::WebContents::CreateParams& create_params)
: web_contents_(content::WebContents::Create(create_params)) {
InspectableWebContentsImpl::InspectableWebContentsImpl(content::WebContents* web_contents)
: web_contents_(web_contents) {
auto context = static_cast<BrowserContext*>(web_contents_->GetBrowserContext());
dock_side_ = context->prefs()->GetString(kDockSidePref);

2
brightray/browser/inspectable_web_contents_impl.h
View file

@ -31,7 +31,7 @@ class InspectableWebContentsImpl :
public:
static void RegisterPrefs(PrefRegistrySimple*);
InspectableWebContentsImpl(const content::WebContents::CreateParams&);
InspectableWebContentsImpl(content::WebContents*);
virtual ~InspectableWebContentsImpl() OVERRIDE;
virtual InspectableWebContentsView* GetView() const OVERRIDE;