Merge pull request #65 from brightray/mac-devtools-focus

Focus on devtools when it is opened on Mac.
electron · Aug 7, 2014 · b06cc7a · b06cc7a
2 parents 2f87b81 + 29bada5
commit b06cc7a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/browser/devtools_delegate.cc b/browser/devtools_delegate.cc
@@ -139,7 +139,6 @@ DevToolsDelegate::DevToolsDelegate(
 }
 
 DevToolsDelegate::~DevToolsDelegate() {
-	LOG(ERROR) << "delete!";
 }
 
 void DevToolsDelegate::Stop() {

diff --git a/browser/devtools_delegate.h b/browser/devtools_delegate.h
@@ -49,6 +49,6 @@ class DevToolsDelegate : public content::DevToolsHttpHandlerDelegate {
   DISALLOW_COPY_AND_ASSIGN(DevToolsDelegate);
 };
 
-}  // namespace brightray 
+}  // namespace brightray
 
 #endif  // BRIGHTRAY_DEVTOOLS_DELEGATE_H_
diff --git a/browser/mac/bry_inspectable_web_contents_view.mm b/browser/mac/bry_inspectable_web_contents_view.mm
@@ -55,6 +55,9 @@ - (void)setDevToolsVisible:(BOOL)visible {
       // sizes for them until the setContentsResizingStrategy message.
       [self addSubview:devToolsView positioned:NSWindowBelow relativeTo:nil];
       [self update];
+
+      // Focus on web view.
+      devToolsWebContents->RestoreFocus();
     } else {
       gfx::ScopedNSDisableScreenUpdates disabler;
       devToolsWebContents->RemoveOverlayView();