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

Update for changes to devtools in Chrome 31

Browse source 
browser/devtools_embedder_message_dispatcher.* came from
chrome/browser/devtools, and were modified just enough to compile within
brightray.
This commit is contained in:
Adam Roben 2013-12-02 12:38:24 -05:00
parent 1da8c37098
commit 265076f19a
5 changed files with 297 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
brightray/browser/inspectable_web_contents_impl.h
View file

@ -8,6 +8,8 @@
#include "browser/inspectable_web_contents.h"
#include "browser/devtools_embedder_message_dispatcher.h"
#include "content/public/browser/devtools_frontend_host_delegate.h"
#include "content/public/browser/web_contents_delegate.h"
#include "content/public/browser/web_contents_observer.h"
@ -27,7 +29,8 @@ class InspectableWebContentsImpl :
public InspectableWebContents,
content::DevToolsFrontendHostDelegate,
content::WebContentsObserver,
content::WebContentsDelegate {
content::WebContentsDelegate,
DevToolsEmbedderMessageDispatcher::Delegate {
public:
static void RegisterPrefs(PrefRegistrySimple* pref_registry);
@ -46,10 +49,9 @@ class InspectableWebContentsImpl :
private:
void UpdateFrontendDockSide();
// content::DevToolsFrontendHostDelegate
// DevToolsEmbedderMessageDispacher::Delegate
virtual void ActivateWindow() OVERRIDE;
virtual void ChangeAttachedWindowHeight(unsigned height) OVERRIDE;
virtual void CloseWindow() OVERRIDE;
virtual void MoveWindow(int x, int y) OVERRIDE;
virtual void SetDockSide(const std::string& side) OVERRIDE;
@ -68,6 +70,10 @@ class InspectableWebContentsImpl :
virtual void SearchInPath(int request_id,
const std::string& file_system_path,
const std::string& query) OVERRIDE;
// content::DevToolsFrontendHostDelegate
virtual void DispatchOnEmbedder(const std::string& message) OVERRIDE;
virtual void InspectedContentsClosing() OVERRIDE;
// content::WebContentsObserver
@ -92,6 +98,8 @@ class InspectableWebContentsImpl :
scoped_refptr<content::DevToolsAgentHost> agent_host_;
std::string dock_side_;
scoped_ptr<DevToolsEmbedderMessageDispatcher> embedder_message_dispatcher_;
DISALLOW_COPY_AND_ASSIGN(InspectableWebContentsImpl);
};