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

Use new devtools structure in brightray.

Browse source 
Fixes #210.
Fixes #275.
This commit is contained in:
Cheng Zhao 2014-07-02 16:38:11 +08:00
parent 2cc2fd03fa
commit 949821f255
4 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

11
atom/browser/native_window.cc
View file

@ -70,12 +70,6 @@ NativeWindow::NativeWindow(content::WebContents* web_contents,
brightray::InspectableWebContents::Create(web_contents)) {
options.Get(switches::kFrame, &has_frame_);
#if defined(OS_MACOSX)
// Temporary fix for flashing devtools, try removing this after upgraded to
// Chrome 32.
web_contents->GetView()->SetAllowOverlappingViews(false);
#endif
// Read icon before window is created.
gfx::ImageSkia icon;
if (options.Get(switches::kIcon, &icon))
@ -209,11 +203,6 @@ bool NativeWindow::HasModalDialog() {
void NativeWindow::OpenDevTools() {
inspectable_web_contents()->ShowDevTools();
#if defined(OS_MACOSX)
// Temporary fix for flashing devtools, try removing this after upgraded to
// Chrome 32.
GetDevToolsWebContents()->GetView()->SetAllowOverlappingViews(false);
#endif
}
void NativeWindow::CloseDevTools() {