From 1059a6a49595d367beded14bcc7ce27bf7eec0c8 Mon Sep 17 00:00:00 2001
From: Corey Johnson <cj@github.com>
Date: Tue, 26 Jun 2012 16:38:06 -0700
Subject: [PATCH] Make dev tools work with specs

---
 Atom/src/AtomController.mm        | 4 ++--
 benchmark/benchmark-helper.coffee | 4 ++--
 spec/spec-helper.coffee           | 2 +-
 src/app/root-view.coffee          | 1 -
 src/app/window.coffee             | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Atom/src/AtomController.mm b/Atom/src/AtomController.mm
index 6eb4f917a..bb323a7b9 100644
--- a/Atom/src/AtomController.mm
+++ b/Atom/src/AtomController.mm
@@ -76,11 +76,11 @@
     [_devToolsView release];
     _devToolsView = nil;
   }
-  else {
+  else if (_clientHandler && _clientHandler->GetBrowser()) {
     NSRect frame = NSMakeRect(0, 0, _splitView.frame.size.height, _splitView.frame.size.height);
     _devToolsView = [[NSView alloc] initWithFrame:frame];
     [_splitView addSubview:_devToolsView];
-    CefV8Context::GetCurrentContext()->GetBrowser()->ShowDevTools();
+    _clientHandler->GetBrowser()->ShowDevTools();
   }
   
   [_splitView adjustSubviews];
diff --git a/benchmark/benchmark-helper.coffee b/benchmark/benchmark-helper.coffee
index d3cd2959a..2d836313f 100644
--- a/benchmark/benchmark-helper.coffee
+++ b/benchmark/benchmark-helper.coffee
@@ -16,7 +16,7 @@ keymap.bindKeys '*',
   'meta-w': 'close'
   'alt-meta-i': 'show-console'
 $(document).on 'close', -> window.close()
-$(document).on 'show-console', -> window.showConsole()
+$(document).on 'show-console', -> $native.showDevTools()
 
 defaultCount = 100
 window.pbenchmark = (args...) -> window.benchmark(args..., profile: true)
@@ -33,7 +33,7 @@ window.benchmark = (args...) ->
   [fn, options] = args
   { profile, focused } = (options ? {})
 
-  window.showConsole() if profile
+  $native.showDevTools() if profile
   method = if focused then fit else it
   method description, ->
     total = measure ->
diff --git a/spec/spec-helper.coffee b/spec/spec-helper.coffee
index ad69ea9ad..155988e33 100644
--- a/spec/spec-helper.coffee
+++ b/spec/spec-helper.coffee
@@ -7,7 +7,7 @@ Project = require 'project'
 Directory = require 'directory'
 RootView = require 'root-view'
 require 'window'
-window.showConsole()
+$native.showDevTools()
 
 requireStylesheet "jasmine.css"
 
diff --git a/src/app/root-view.coffee b/src/app/root-view.coffee
index 6b083de3a..6126c5b5b 100644
--- a/src/app/root-view.coffee
+++ b/src/app/root-view.coffee
@@ -177,5 +177,4 @@ class RootView extends View
       require atom.userConfigurationPath if fs.exists(atom.userConfigurationPath)
     catch error
       console.error "Failed to load `#{atom.userConfigurationPath}`", error.message, error
-      window.showConsole()
 
diff --git a/src/app/window.coffee b/src/app/window.coffee
index 6ca3484c7..2df9e0340 100644
--- a/src/app/window.coffee
+++ b/src/app/window.coffee
@@ -72,7 +72,7 @@ windowAdditions =
     $native.toggleDevTools()
 
   onerror: ->
-    @showConsole()
+    $native.showDevTools()
 
 window[key] = value for key, value of windowAdditions
 window.setUpKeymap()