From 6af7388ac0ed36a09a3412908a08e12804ae07c9 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Wed, 11 Mar 2015 14:53:32 -0700 Subject: [PATCH] Use DevToolsAPI instead of InspectorFrontendAPI --- atom/browser/lib/chrome-extension.coffee | 2 +- atom/browser/native_window.cc | 6 +++--- vendor/brightray | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/atom/browser/lib/chrome-extension.coffee b/atom/browser/lib/chrome-extension.coffee index 1b987187c46a..884a9e25d6eb 100644 --- a/atom/browser/lib/chrome-extension.coffee +++ b/atom/browser/lib/chrome-extension.coffee @@ -74,7 +74,7 @@ app.once 'ready', -> return new protocol.RequestFileJob(path.join(directory, parsed.path)) BrowserWindow::_loadDevToolsExtensions = (extensionInfoArray) -> - @devToolsWebContents?.executeJavaScript "WebInspector.addExtensions(#{JSON.stringify(extensionInfoArray)});" + @devToolsWebContents?.executeJavaScript "DevToolsAPI.addExtensions(#{JSON.stringify(extensionInfoArray)});" BrowserWindow.addDevToolsExtension = (srcDirectory) -> extensionInfo = getExtensionInfoFromPath srcDirectory diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc index 676707a8d9fe..f975e582cace 100644 --- a/atom/browser/native_window.cc +++ b/atom/browser/native_window.cc @@ -731,7 +731,7 @@ void NativeWindow::DevToolsSaveToFile(const std::string& url, base::FilePath default_path(base::FilePath::FromUTF8Unsafe(url)); if (!file_dialog::ShowSaveDialog(this, url, default_path, filters, &path)) { base::StringValue url_value(url); - CallDevToolsFunction("InspectorFrontendAPI.canceledSaveURL", &url_value); + CallDevToolsFunction("DevToolsAPI.canceledSaveURL", &url_value); return; } } @@ -741,7 +741,7 @@ void NativeWindow::DevToolsSaveToFile(const std::string& url, // Notify devtools. base::StringValue url_value(url); - CallDevToolsFunction("InspectorFrontendAPI.savedURL", &url_value); + CallDevToolsFunction("DevToolsAPI.savedURL", &url_value); } void NativeWindow::DevToolsAppendToFile(const std::string& url, @@ -753,7 +753,7 @@ void NativeWindow::DevToolsAppendToFile(const std::string& url, // Notify devtools. base::StringValue url_value(url); - CallDevToolsFunction("InspectorFrontendAPI.appendedToURL", &url_value); + CallDevToolsFunction("DevToolsAPI.appendedToURL", &url_value); } void NativeWindow::ScheduleUnresponsiveEvent(int ms) { diff --git a/vendor/brightray b/vendor/brightray index 1d28a857419b..57ebc1a6cb3b 160000 --- a/vendor/brightray +++ b/vendor/brightray @@ -1 +1 @@ -Subproject commit 1d28a857419b8a4c9c524b64394983f547af025a +Subproject commit 57ebc1a6cb3bd920d880643e9814801be9b57cd1