mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Use DevToolsAPI instead of InspectorFrontendAPI

Browse source
This commit is contained in:
Cheng Zhao 2015-03-11 14:53:32 -07:00
parent d16d5b290a
commit 6af7388ac0
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/lib/chrome-extension.coffee
View file

@ -74,7 +74,7 @@ app.once 'ready', ->
return new protocol.RequestFileJob(path.join(directory, parsed.path)) return new protocol.RequestFileJob(path.join(directory, parsed.path))
BrowserWindow::_loadDevToolsExtensions = (extensionInfoArray) -> BrowserWindow::_loadDevToolsExtensions = (extensionInfoArray) ->
@devToolsWebContents?.executeJavaScript "WebInspector.addExtensions(#{JSON.stringify(extensionInfoArray)});" @devToolsWebContents?.executeJavaScript "DevToolsAPI.addExtensions(#{JSON.stringify(extensionInfoArray)});"
BrowserWindow.addDevToolsExtension = (srcDirectory) -> BrowserWindow.addDevToolsExtension = (srcDirectory) ->
extensionInfo = getExtensionInfoFromPath srcDirectory extensionInfo = getExtensionInfoFromPath srcDirectory

6
atom/browser/native_window.cc
View file

@ -731,7 +731,7 @@ void NativeWindow::DevToolsSaveToFile(const std::string& url,
base::FilePath default_path(base::FilePath::FromUTF8Unsafe(url)); base::FilePath default_path(base::FilePath::FromUTF8Unsafe(url));
if (!file_dialog::ShowSaveDialog(this, url, default_path, filters, &path)) { if (!file_dialog::ShowSaveDialog(this, url, default_path, filters, &path)) {
base::StringValue url_value(url); base::StringValue url_value(url);
CallDevToolsFunction("InspectorFrontendAPI.canceledSaveURL", &url_value); CallDevToolsFunction("DevToolsAPI.canceledSaveURL", &url_value);
return; return;
} }
} }
@ -741,7 +741,7 @@ void NativeWindow::DevToolsSaveToFile(const std::string& url,
// Notify devtools. // Notify devtools.
base::StringValue url_value(url); base::StringValue url_value(url);
CallDevToolsFunction("InspectorFrontendAPI.savedURL", &url_value); CallDevToolsFunction("DevToolsAPI.savedURL", &url_value);
} }
void NativeWindow::DevToolsAppendToFile(const std::string& url, void NativeWindow::DevToolsAppendToFile(const std::string& url,
@ -753,7 +753,7 @@ void NativeWindow::DevToolsAppendToFile(const std::string& url,
// Notify devtools. // Notify devtools.
base::StringValue url_value(url); base::StringValue url_value(url);
CallDevToolsFunction("InspectorFrontendAPI.appendedToURL", &url_value); CallDevToolsFunction("DevToolsAPI.appendedToURL", &url_value);
} }
void NativeWindow::ScheduleUnresponsiveEvent(int ms) { void NativeWindow::ScheduleUnresponsiveEvent(int ms) {

2
vendor/brightray vendored

@ -1 +1 @@
Subproject commit 1d28a857419b8a4c9c524b64394983f547af025a Subproject commit 57ebc1a6cb3bd920d880643e9814801be9b57cd1