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

Adapt to API changes of Chrome 38

Browse source
This commit is contained in:
Cheng Zhao 2014-10-11 16:38:27 +08:00
parent 5c455b6ff9
commit 5bec155c81
13 changed files with 77 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

31
brightray/browser/inspectable_web_contents_impl.h
View file

@ -11,7 +11,8 @@
#include "browser/devtools_contents_resizing_strategy.h"
#include "browser/devtools_embedder_message_dispatcher.h"
#include "content/public/browser/devtools_frontend_host_delegate.h"
#include "content/public/browser/devtools_client_host.h"
#include "content/public/browser/devtools_frontend_host.h"
#include "content/public/browser/web_contents_delegate.h"
#include "content/public/browser/web_contents_observer.h"
#include "ui/gfx/rect.h"
@ -20,7 +21,6 @@ class PrefRegistrySimple;
namespace content {
class DevToolsAgentHost;
class DevToolsClientHost;
}
namespace brightray {
@ -30,10 +30,11 @@ class InspectableWebContentsView;
class InspectableWebContentsImpl :
public InspectableWebContents,
content::DevToolsFrontendHostDelegate,
content::WebContentsObserver,
content::WebContentsDelegate,
DevToolsEmbedderMessageDispatcher::Delegate {
public content::DevToolsFrontendHost::Delegate,
public content::DevToolsClientHost,
public content::WebContentsObserver,
public content::WebContentsDelegate,
public DevToolsEmbedderMessageDispatcher::Delegate {
public:
static void RegisterPrefs(PrefRegistrySimple* pref_registry);
@ -92,19 +93,19 @@ class InspectableWebContentsImpl :
virtual void ZoomOut() OVERRIDE;
virtual void ResetZoom() OVERRIDE;
// content::DevToolsFrontendHostDelegate
// content::DevToolsClientHost:
virtual void DispatchOnInspectorFrontend(const std::string& message) override;
virtual void InspectedContentsClosing() override;
virtual void ReplacedWithAnotherClient() override;
virtual void DispatchOnEmbedder(const std::string& message) OVERRIDE;
virtual void InspectedContentsClosing() OVERRIDE;
// content::DevToolsFrontendHostDelegate:
virtual void HandleMessageFromDevToolsFrontend(const std::string& message) override;
virtual void HandleMessageFromDevToolsFrontendToBackend(const std::string& message) override;
// content::WebContentsObserver
virtual void AboutToNavigateRenderView(
content::RenderViewHost* render_view_host) OVERRIDE;
virtual void DidFinishLoad(int64 frame_id,
const GURL& validated_url,
bool is_main_frame,
content::RenderViewHost*) OVERRIDE;
virtual void DidFinishLoad(content::RenderFrameHost* render_frame_host,
const GURL& validated_url) OVERRIDE;
virtual void WebContentsDestroyed() OVERRIDE;
// content::WebContentsDelegate