From 0a7b1fdd8722fb1a82edf844873553feeb48d6f2 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Tue, 8 Jul 2014 15:58:38 +0800 Subject: [PATCH] Add new devtools messages in Chrome 35. --- .../devtools_embedder_message_dispatcher.cc | 15 +++++++++++++++ .../devtools_embedder_message_dispatcher.h | 6 ++++++ .../browser/inspectable_web_contents_impl.cc | 16 ++++++++++++++++ .../browser/inspectable_web_contents_impl.h | 6 ++++++ 4 files changed, 43 insertions(+) diff --git a/brightray/browser/devtools_embedder_message_dispatcher.cc b/brightray/browser/devtools_embedder_message_dispatcher.cc index 98e4732208b8..31351778f897 100644 --- a/brightray/browser/devtools_embedder_message_dispatcher.cc +++ b/brightray/browser/devtools_embedder_message_dispatcher.cc @@ -198,6 +198,9 @@ DevToolsEmbedderMessageDispatcher::DevToolsEmbedderMessageDispatcher( RegisterHandler("setContentsResizingStrategy", BindToListParser(base::Bind(&Delegate::SetContentsResizingStrategy, base::Unretained(delegate)))); + RegisterHandler("inspectElementCompleted", + BindToListParser(base::Bind(&Delegate::InspectElementCompleted, + base::Unretained(delegate)))); RegisterHandler("moveWindowBy", BindToListParser(base::Bind(&Delegate::MoveWindow, base::Unretained(delegate)))); @@ -222,6 +225,9 @@ DevToolsEmbedderMessageDispatcher::DevToolsEmbedderMessageDispatcher( RegisterHandler("removeFileSystem", BindToListParser(base::Bind(&Delegate::RemoveFileSystem, base::Unretained(delegate)))); + RegisterHandler("upgradeDraggedFileSystemPermissions", + BindToListParser(base::Bind(&Delegate::UpgradeDraggedFileSystemPermissions, + base::Unretained(delegate)))); RegisterHandler("indexPath", BindToListParser(base::Bind(&Delegate::IndexPath, base::Unretained(delegate)))); @@ -231,6 +237,15 @@ DevToolsEmbedderMessageDispatcher::DevToolsEmbedderMessageDispatcher( RegisterHandler("searchInPath", BindToListParser(base::Bind(&Delegate::SearchInPath, base::Unretained(delegate)))); + RegisterHandler("zoomIn", + BindToListParser(base::Bind(&Delegate::ZoomIn, + base::Unretained(delegate)))); + RegisterHandler("zoomOut", + BindToListParser(base::Bind(&Delegate::ZoomOut, + base::Unretained(delegate)))); + RegisterHandler("resetZoom", + BindToListParser(base::Bind(&Delegate::ResetZoom, + base::Unretained(delegate)))); } DevToolsEmbedderMessageDispatcher::~DevToolsEmbedderMessageDispatcher() {} diff --git a/brightray/browser/devtools_embedder_message_dispatcher.h b/brightray/browser/devtools_embedder_message_dispatcher.h index 1f4a6e5d00c9..e43abff5285e 100644 --- a/brightray/browser/devtools_embedder_message_dispatcher.h +++ b/brightray/browser/devtools_embedder_message_dispatcher.h @@ -34,6 +34,7 @@ class DevToolsEmbedderMessageDispatcher { virtual void CloseWindow() = 0; virtual void SetContentsResizingStrategy( const gfx::Insets& insets, const gfx::Size& min_size) = 0; + virtual void InspectElementCompleted() = 0; virtual void MoveWindow(int x, int y) = 0; virtual void SetIsDocked(bool docked) = 0; virtual void OpenInNewTab(const std::string& url) = 0; @@ -45,12 +46,17 @@ class DevToolsEmbedderMessageDispatcher { virtual void RequestFileSystems() = 0; virtual void AddFileSystem() = 0; virtual void RemoveFileSystem(const std::string& file_system_path) = 0; + virtual void UpgradeDraggedFileSystemPermissions( + const std::string& file_system_url) = 0; virtual void IndexPath(int request_id, const std::string& file_system_path) = 0; virtual void StopIndexing(int request_id) = 0; virtual void SearchInPath(int request_id, const std::string& file_system_path, const std::string& query) = 0; + virtual void ZoomIn() = 0; + virtual void ZoomOut() = 0; + virtual void ResetZoom() = 0; }; explicit DevToolsEmbedderMessageDispatcher(Delegate* delegate); diff --git a/brightray/browser/inspectable_web_contents_impl.cc b/brightray/browser/inspectable_web_contents_impl.cc index 79143aa122c9..38278f265af0 100644 --- a/brightray/browser/inspectable_web_contents_impl.cc +++ b/brightray/browser/inspectable_web_contents_impl.cc @@ -155,6 +155,9 @@ void InspectableWebContentsImpl::SetContentsResizingStrategy( view_->SetContentsResizingStrategy(contents_resizing_strategy_); } +void InspectableWebContentsImpl::InspectElementCompleted() { +} + void InspectableWebContentsImpl::MoveWindow(int x, int y) { } @@ -187,6 +190,10 @@ void InspectableWebContentsImpl::RemoveFileSystem( const std::string& file_system_path) { } +void InspectableWebContentsImpl::UpgradeDraggedFileSystemPermissions( + const std::string& file_system_url) { +} + void InspectableWebContentsImpl::IndexPath( int request_id, const std::string& file_system_path) { } @@ -200,6 +207,15 @@ void InspectableWebContentsImpl::SearchInPath( const std::string& query) { } +void InspectableWebContentsImpl::ZoomIn() { +} + +void InspectableWebContentsImpl::ZoomOut() { +} + +void InspectableWebContentsImpl::ResetZoom() { +} + void InspectableWebContentsImpl::DispatchOnEmbedder( const std::string& message) { embedder_message_dispatcher_->Dispatch(message); diff --git a/brightray/browser/inspectable_web_contents_impl.h b/brightray/browser/inspectable_web_contents_impl.h index d02fd75400f0..1fcfff553799 100644 --- a/brightray/browser/inspectable_web_contents_impl.h +++ b/brightray/browser/inspectable_web_contents_impl.h @@ -66,6 +66,7 @@ class InspectableWebContentsImpl : virtual void CloseWindow() OVERRIDE; virtual void SetContentsResizingStrategy( const gfx::Insets& insets, const gfx::Size& min_size) OVERRIDE; + virtual void InspectElementCompleted() OVERRIDE; virtual void MoveWindow(int x, int y) OVERRIDE; virtual void SetIsDocked(bool docked) OVERRIDE; virtual void OpenInNewTab(const std::string& url) OVERRIDE; @@ -77,12 +78,17 @@ class InspectableWebContentsImpl : virtual void RequestFileSystems() OVERRIDE; virtual void AddFileSystem() OVERRIDE; virtual void RemoveFileSystem(const std::string& file_system_path) OVERRIDE; + virtual void UpgradeDraggedFileSystemPermissions( + const std::string& file_system_url) OVERRIDE; virtual void IndexPath(int request_id, const std::string& file_system_path) OVERRIDE; virtual void StopIndexing(int request_id) OVERRIDE; virtual void SearchInPath(int request_id, const std::string& file_system_path, const std::string& query) OVERRIDE; + virtual void ZoomIn() OVERRIDE; + virtual void ZoomOut() OVERRIDE; + virtual void ResetZoom() OVERRIDE; // content::DevToolsFrontendHostDelegate