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

Update to new devtools messages

Browse source
This commit is contained in:
Cheng Zhao 2015-06-05 11:03:47 +08:00
parent 3f2c2e3484
commit d48a80bdfa
4 changed files with 300 additions and 260 deletions
Download patch file Download diff file Expand all files Collapse all files

32
brightray/browser/inspectable_web_contents_impl.h
View file

@ -11,6 +11,7 @@
#include "browser/devtools_contents_resizing_strategy.h"
#include "browser/devtools_embedder_message_dispatcher.h"
#include "base/memory/weak_ptr.h"
#include "content/public/browser/devtools_agent_host.h"
#include "content/public/browser/devtools_frontend_host.h"
#include "content/public/browser/web_contents_delegate.h"
@ -51,6 +52,10 @@ class InspectableWebContentsImpl :
void AttachTo(const scoped_refptr<content::DevToolsAgentHost>&) override;
void Detach();
void CallClientFunction(const std::string& function_name,
const base::Value* arg1,
const base::Value* arg2,
const base::Value* arg3);
// Return the last position and size of devtools window.
gfx::Rect GetDevToolsBounds() const;
@ -71,10 +76,15 @@ class InspectableWebContentsImpl :
// DevToolsEmbedderMessageDispacher::Delegate
void ActivateWindow() override;
void CloseWindow() override;
void LoadCompleted() override;
void SetInspectedPageBounds(const gfx::Rect& rect) override;
void InspectElementCompleted() override;
void MoveWindow(int x, int y) override;
void SetIsDocked(bool docked) override;
void InspectedURLChanged(const std::string& url) override;
void LoadNetworkResource(const DispatchCallback& callback,
const std::string& url,
const std::string& headers,
int stream_id) override;
void SetIsDocked(const DispatchCallback& callback, bool is_docked) override;
void OpenInNewTab(const std::string& url) override;
void SaveToFile(const std::string& url,
const std::string& content,
@ -86,15 +96,22 @@ class InspectableWebContentsImpl :
void RemoveFileSystem(const std::string& file_system_path) override;
void UpgradeDraggedFileSystemPermissions(
const std::string& file_system_url) override;
void IndexPath(int request_id,
void IndexPath(int index_request_id,
const std::string& file_system_path) override;
void StopIndexing(int request_id) override;
void SearchInPath(int request_id,
void StopIndexing(int index_request_id) override;
void SearchInPath(int search_request_id,
const std::string& file_system_path,
const std::string& query) override;
void SetWhitelistedShortcuts(const std::string& message) override;
void ZoomIn() override;
void ZoomOut() override;
void ResetZoom() override;
void SetDevicesUpdatesEnabled(bool enabled) override;
void SendMessageToBrowser(const std::string& message) override;
void RecordActionUMA(const std::string& name, int action) override;
void SendJsonRequest(const DispatchCallback& callback,
const std::string& browser_id,
const std::string& url) override;
// content::DevToolsFrontendHostDelegate:
void HandleMessageFromDevToolsFrontend(const std::string& message) override;
@ -133,6 +150,9 @@ class InspectableWebContentsImpl :
void CloseContents(content::WebContents* source) override;
void WebContentsFocused(content::WebContents* contents) override;
void SendMessageAck(int request_id,
const base::Value* arg1);
scoped_ptr<content::WebContents> web_contents_;
scoped_ptr<content::WebContents> devtools_web_contents_;
scoped_ptr<InspectableWebContentsView> view_;
@ -147,6 +167,8 @@ class InspectableWebContentsImpl :
InspectableWebContentsDelegate* delegate_;
base::WeakPtrFactory<InspectableWebContentsImpl> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(InspectableWebContentsImpl);
};