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

Fix compilation warnings due to API changes

Browse source
This commit is contained in:
Cheng Zhao 2014-12-06 22:16:00 -08:00
parent 289d3b54f3
commit 2c81fb4719
6 changed files with 20 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

10
brightray/browser/mac/bry_inspectable_web_contents_view.mm
View file

@ -21,8 +21,6 @@ using namespace brightray;
devtools_docked_ = NO;
auto contents = inspectableWebContentsView_->inspectable_web_contents()->GetWebContents();
contents->SetAllowOverlappingViews(true);
auto contentsView = contents->GetNativeView();
[contentsView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
[self addSubview:contentsView];
@ -45,9 +43,17 @@ using namespace brightray;
if (visible == devtools_visible_)
return;
auto webContents = inspectableWebContentsView_->inspectable_web_contents()->GetWebContents();
auto devToolsWebContents = inspectableWebContentsView_->inspectable_web_contents()->devtools_web_contents();
auto devToolsView = devToolsWebContents->GetNativeView();
if (visible && devtools_docked_) {
webContents->SetAllowOtherViews(true);
devToolsWebContents->SetAllowOtherViews(true);
} else {
webContents->SetAllowOtherViews(false);
}
devtools_visible_ = visible;
if (devtools_docked_) {
if (visible) {