diff options
| -rw-r--r-- | chrome/browser/debugger/devtools_window.cc | 10 | ||||
| -rw-r--r-- | content/renderer/devtools_client.cc | 5 | ||||
| -rw-r--r-- | content/renderer/devtools_client.h | 2 |
3 files changed, 5 insertions, 12 deletions
diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc index dbe4753..b3e7e90 100644 --- a/chrome/browser/debugger/devtools_window.cc +++ b/chrome/browser/debugger/devtools_window.cc @@ -421,7 +421,7 @@ bool DevToolsWindow::IsInspectedBrowserPopupOrPanel() { void DevToolsWindow::UpdateFrontendAttachedState() { base::FundamentalValue docked(docked_); - CallClientFunction("WebInspector.setAttachedWindow", &docked); + CallClientFunction("InspectorFrontendAPI.setAttachedWindow", &docked); } @@ -513,10 +513,10 @@ void DevToolsWindow::DoAction() { // TODO: these messages should be pushed through the WebKit API instead. switch (action_on_load_) { case DEVTOOLS_TOGGLE_ACTION_SHOW_CONSOLE: - CallClientFunction("WebInspector.showConsole", NULL); + CallClientFunction("InspectorFrontendAPI.showConsole", NULL); break; case DEVTOOLS_TOGGLE_ACTION_INSPECT: - CallClientFunction("WebInspector.toggleSearchingForNode", NULL); + CallClientFunction("InspectorFrontendAPI.enterInspectElementMode", NULL); case DEVTOOLS_TOGGLE_ACTION_NONE: // Do nothing. break; @@ -573,7 +573,7 @@ void DevToolsWindow::UpdateTheme() { SkColor color_tab_text = tp->GetColor(ThemeService::COLOR_BOOKMARK_TEXT); std::string command = StringPrintf( - "WebInspector.setToolbarColors(\"%s\", \"%s\")", + "InspectorFrontendAPI.setToolbarColors(\"%s\", \"%s\")", SkColorToRGBAString(color_toolbar).c_str(), SkColorToRGBAString(color_tab_text).c_str()); tab_contents_->web_contents()->GetRenderViewHost()-> @@ -741,7 +741,7 @@ void DevToolsWindow::SaveToFile(const std::string& url, void DevToolsWindow::FileSavedAs(const std::string& url, const FilePath& path) { StringValue url_value(url); - CallClientFunction("WebInspector.savedURL", &url_value); + CallClientFunction("InspectorFrontendAPI.savedURL", &url_value); } content::JavaScriptDialogCreator* DevToolsWindow::GetJavaScriptDialogCreator() { diff --git a/content/renderer/devtools_client.cc b/content/renderer/devtools_client.cc index 56581e8..0bc3523 100644 --- a/content/renderer/devtools_client.cc +++ b/content/renderer/devtools_client.cc @@ -79,11 +79,6 @@ void DevToolsClient::openInNewTab(const WebKit::WebString& url) { url.utf8())); } -void DevToolsClient::saveAs(const WebKit::WebString& url, - const WebKit::WebString& content) { - save(url, content, true); -} - void DevToolsClient::save(const WebKit::WebString& url, const WebKit::WebString& content, bool save_as) { diff --git a/content/renderer/devtools_client.h b/content/renderer/devtools_client.h index ebec62f..6d7e05d 100644 --- a/content/renderer/devtools_client.h +++ b/content/renderer/devtools_client.h @@ -46,8 +46,6 @@ class DevToolsClient : public content::RenderViewObserver, virtual void requestUndockWindow() OVERRIDE; virtual void requestSetDockSide(const WebKit::WebString& side) OVERRIDE; virtual void openInNewTab(const WebKit::WebString& side) OVERRIDE; - virtual void saveAs(const WebKit::WebString& url, - const WebKit::WebString& content) OVERRIDE; virtual void save(const WebKit::WebString& url, const WebKit::WebString& content, bool save_as) OVERRIDE; |