Make devtools API aware of devtools window.
authorCheng Zhao <zcbenz@gmail.com>
Tue, 4 Mar 2014 10:45:36 +0000 (18:45 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Tue, 4 Mar 2014 10:45:36 +0000 (18:45 +0800)
browser/native_window.cc

index b3e492d..177cab7 100644 (file)
@@ -188,11 +188,15 @@ void NativeWindow::OpenDevTools() {
 }
 
 void NativeWindow::CloseDevTools() {
-  inspectable_web_contents()->GetView()->CloseDevTools();
+  if (devtools_window_)
+    devtools_window_->Close();
+  else
+    inspectable_web_contents()->GetView()->CloseDevTools();
 }
 
 bool NativeWindow::IsDevToolsOpened() {
-  return inspectable_web_contents()->IsDevToolsViewShowing();
+  return (devtools_window_ && devtools_window_->IsFocused()) ||
+         inspectable_web_contents()->IsDevToolsViewShowing();
 }
 
 void NativeWindow::InspectElement(int x, int y) {