add window.closeDevTools()

rogerwang · rogerwang · commit f7e4bb6bafe2 · 2013-09-09T11:06:12.000+08:00
diff --git a/src/api/window/window.cc b/src/api/window/window.cc
@@ -84,7 +84,9 @@ void Window::Call(const std::string& method,
     arguments.GetString(0, &jail_id);
     arguments.GetBoolean(1, &headless);
     shell_->ShowDevTools(jail_id.c_str(), headless);
-  } else if (method == "ResizeTo") {
+  } else if (method == "CloseDevTools") {
+    shell_->CloseDevTools();
+  }else if (method == "ResizeTo") {
     int width, height;
     if (arguments.GetInteger(0, &width) &&
         arguments.GetInteger(1, &height))
diff --git a/src/api/window_bindings.js b/src/api/window_bindings.js
@@ -269,6 +269,10 @@ Window.prototype.toggleKioskMode = function() {
   CallObjectMethod(this, 'ToggleKioskMode', []);
 }
 
+Window.prototype.closeDevTools = function() {
+  CallObjectMethod(this, 'CloseDevTools', []);
+}
+
 Window.prototype.showDevTools = function(frm, headless) {
     var id = '';
     if (typeof frm === 'string') {
diff --git a/src/nw_shell.cc b/src/nw_shell.cc
@@ -300,31 +300,14 @@ void Shell::ReloadOrStop() {
     Reload();
 }
 
-#if 0
 void Shell::CloseDevTools() {
-  if (!devtools_frontend_)
+  if (!devtools_window_)
     return;
-  registrar_.Remove(this,
-                    NOTIFICATION_WEB_CONTENTS_DESTROYED,
-                    Source<WebContents>(
-                        devtools_frontend_->frontend_shell()->web_contents()));
-  devtools_frontend_->Close();
-  devtools_frontend_ = NULL;
+  devtools_window_->window()->Close();
+  devtools_window_.reset();
 }
-#endif
 
 void Shell::ShowDevTools(const char* jail_id, bool headless) {
-#if 0
-  if (devtools_frontend_) {
-    devtools_frontend_->Focus();
-    return;
-  }
-  devtools_frontend_ = ShellDevToolsFrontend::Show(web_contents());
-  registrar_.Add(this,
-                 NOTIFICATION_WEB_CONTENTS_DESTROYED,
-                 Source<WebContents>(
-                     devtools_frontend_->frontend_shell()->web_contents()));
-#else
   ShellContentBrowserClient* browser_client =
       static_cast<ShellContentBrowserClient*>(
           GetContentClient()->browser());
@@ -387,7 +370,6 @@ void Shell::ShowDevTools(const char* jail_id, bool headless) {
   browser_context->set_pinning_renderer(true);
   // Save devtools window in current shell.
   devtools_window_ = shell->weak_ptr_factory_.GetWeakPtr();
-#endif
 }
 
 void Shell::UpdateDraggableRegions(
diff --git a/src/nw_shell.h b/src/nw_shell.h
@@ -98,9 +98,7 @@ class Shell : public WebContentsDelegate,
   void Stop();
   void ReloadOrStop();
   void ShowDevTools(const char* jail_id = NULL, bool headless = false);
-#if 0
   void CloseDevTools();
-#endif
   // Send an event to renderer.
   void SendEvent(const std::string& event, const std::string& arg1 = "");
 
