diff options
author | Andras Becsi <andras.becsi@digia.com> | 2013-12-11 21:33:03 +0100 |
---|---|---|
committer | Andras Becsi <andras.becsi@digia.com> | 2013-12-13 12:34:07 +0100 |
commit | f2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch) | |
tree | 0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/content/renderer/devtools | |
parent | 5362912cdb5eea702b68ebe23702468d17c3017a (diff) | |
download | qtwebengine-chromium-f2a33ff9cbc6d19943f1c7fbddd1f23d23975577.tar.gz |
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/content/renderer/devtools')
-rw-r--r-- | chromium/content/renderer/devtools/devtools_client.cc | 72 | ||||
-rw-r--r-- | chromium/content/renderer/devtools/devtools_client.h | 24 |
2 files changed, 4 insertions, 92 deletions
diff --git a/chromium/content/renderer/devtools/devtools_client.cc b/chromium/content/renderer/devtools/devtools_client.cc index 3530081aff8..5793d2c7ebf 100644 --- a/chromium/content/renderer/devtools/devtools_client.cc +++ b/chromium/content/renderer/devtools/devtools_client.cc @@ -55,75 +55,9 @@ void DevToolsClient::sendMessageToBackend(const WebString& message) { message.utf8())); } -void DevToolsClient::activateWindow() { - Send(new DevToolsHostMsg_ActivateWindow(routing_id())); -} - -void DevToolsClient::changeAttachedWindowHeight(unsigned height) { - Send(new DevToolsHostMsg_ChangeAttachedWindowHeight(routing_id(), height)); -} - -void DevToolsClient::closeWindow() { - Send(new DevToolsHostMsg_CloseWindow(routing_id())); -} - -void DevToolsClient::moveWindowBy(const WebKit::WebFloatPoint& offset) { - Send(new DevToolsHostMsg_MoveWindow(routing_id(), offset.x, offset.y)); -} - -void DevToolsClient::requestSetDockSide(const WebKit::WebString& side) { - Send(new DevToolsHostMsg_RequestSetDockSide(routing_id(), side.utf8())); -} - -void DevToolsClient::openInNewTab(const WebKit::WebString& url) { - Send(new DevToolsHostMsg_OpenInNewTab(routing_id(), - url.utf8())); -} - -void DevToolsClient::save(const WebKit::WebString& url, - const WebKit::WebString& content, - bool save_as) { - Send(new DevToolsHostMsg_Save(routing_id(), - url.utf8(), - content.utf8(), - save_as)); -} - -void DevToolsClient::append(const WebKit::WebString& url, - const WebKit::WebString& content) { - Send(new DevToolsHostMsg_Append(routing_id(), - url.utf8(), - content.utf8())); -} - -void DevToolsClient::requestFileSystems() { - Send(new DevToolsHostMsg_RequestFileSystems(routing_id())); -} - -void DevToolsClient::addFileSystem() { - Send(new DevToolsHostMsg_AddFileSystem(routing_id())); -} - -void DevToolsClient::removeFileSystem(const WebString& file_system_path) { - Send(new DevToolsHostMsg_RemoveFileSystem(routing_id(), - file_system_path.utf8())); -} - -void DevToolsClient::indexPath(int request_id, - const WebKit::WebString& file_system_path) { - Send(new DevToolsHostMsg_IndexPath( - routing_id(), request_id, file_system_path.utf8())); -} - -void DevToolsClient::stopIndexing(int request_id) { - Send(new DevToolsHostMsg_StopIndexing(routing_id(), request_id)); -} - -void DevToolsClient::searchInPath(int request_id, - const WebKit::WebString& file_system_path, - const WebKit::WebString& query) { - Send(new DevToolsHostMsg_SearchInPath( - routing_id(), request_id, file_system_path.utf8(), query.utf8())); +void DevToolsClient::sendMessageToEmbedder(const WebString& message) { + Send(new DevToolsHostMsg_DispatchOnEmbedder(routing_id(), + message.utf8())); } bool DevToolsClient::isUnderTest() { diff --git a/chromium/content/renderer/devtools/devtools_client.h b/chromium/content/renderer/devtools/devtools_client.h index 768253d1851..1c9d3f8fc20 100644 --- a/chromium/content/renderer/devtools/devtools_client.h +++ b/chromium/content/renderer/devtools/devtools_client.h @@ -40,29 +40,7 @@ class CONTENT_EXPORT DevToolsClient // WebDevToolsFrontendClient implementation. virtual void sendMessageToBackend(const WebKit::WebString&) OVERRIDE; - - virtual void activateWindow() OVERRIDE; - virtual void changeAttachedWindowHeight(unsigned height) OVERRIDE; - virtual void closeWindow() OVERRIDE; - virtual void moveWindowBy(const WebKit::WebFloatPoint& offset) OVERRIDE; - virtual void requestSetDockSide(const WebKit::WebString& side) OVERRIDE; - virtual void openInNewTab(const WebKit::WebString& side) OVERRIDE; - virtual void save(const WebKit::WebString& url, - const WebKit::WebString& content, - bool save_as) OVERRIDE; - virtual void append(const WebKit::WebString& url, - const WebKit::WebString& content) OVERRIDE; - - virtual void requestFileSystems() OVERRIDE; - virtual void addFileSystem() OVERRIDE; - virtual void removeFileSystem( - const WebKit::WebString& file_system_path) OVERRIDE; - virtual void indexPath(int request_id, - const WebKit::WebString& file_system_path) OVERRIDE; - virtual void stopIndexing(int request_id) OVERRIDE; - virtual void searchInPath(int request_id, - const WebKit::WebString& file_system_path, - const WebKit::WebString& query) OVERRIDE; + virtual void sendMessageToEmbedder(const WebKit::WebString&) OVERRIDE; virtual bool isUnderTest() OVERRIDE; |