Chromium Code Reviews| Index: chrome/browser/devtools/devtools_adb_bridge.h |
| diff --git a/chrome/browser/devtools/devtools_adb_bridge.h b/chrome/browser/devtools/devtools_adb_bridge.h |
| index 222edf16e062c0950a115a2d042a4b25dbe2362d..3efe3ee0e5ad4ef9683f05efefee9554beebd356 100644 |
| --- a/chrome/browser/devtools/devtools_adb_bridge.h |
| +++ b/chrome/browser/devtools/devtools_adb_bridge.h |
| @@ -96,8 +96,14 @@ class DevToolsAdbBridge |
| std::string description() { return description_; } |
| std::string favicon_url() { return favicon_url_; } |
| std::string global_id() { return global_id_; } |
| + bool attached() { return debug_url_.empty(); } |
| void Inspect(Profile* profile); |
| + void Close(); |
| + void Reload(); |
| + |
| + void SendProtocolCommand(const std::string& method, |
| + base::DictionaryValue* params); |
| private: |
| friend class base::RefCounted<RemotePage>; |
| @@ -129,18 +135,28 @@ class DevToolsAdbBridge |
| scoped_refptr<AndroidDevice> device() { return device_; } |
| std::string socket() { return socket_; } |
| std::string name() { return name_; } |
| + std::string global_id() { return global_id_; } |
|
pfeldman
2013/08/07 09:48:12
It belongs to the client.
Vladislav Kaznacheev
2013/08/07 12:11:05
Done.
|
| RemotePages& pages() { return pages_; } |
| void AddPage(scoped_refptr<RemotePage> page) { pages_.push_back(page); } |
| + void Open(const std::string& url); |
| + |
| private: |
| friend class base::RefCounted<RemoteBrowser>; |
| virtual ~RemoteBrowser(); |
| + void PageCreatedOnHandlerThread( |
| + const std::string& url, int result, const std::string& response); |
| + |
| + void PageCreatedOnUIThread( |
| + const std::string& response, const std::string& url); |
| + |
| scoped_refptr<DevToolsAdbBridge> bridge_; |
| scoped_refptr<AndroidDevice> device_; |
| const std::string socket_; |
| const std::string name_; |
| + std::string global_id_; |
| RemotePages pages_; |
| DISALLOW_COPY_AND_ASSIGN(RemoteBrowser); |
| @@ -156,6 +172,7 @@ class DevToolsAdbBridge |
| scoped_refptr<AndroidDevice> device() { return device_; } |
| std::string serial() { return device_->serial(); } |
| std::string model() { return device_->model(); } |
| + std::string global_id() { return global_id_; } |
| RemoteBrowsers& browsers() { return browsers_; } |
| void AddBrowser(scoped_refptr<RemoteBrowser> browser) { |
| @@ -168,6 +185,7 @@ class DevToolsAdbBridge |
| scoped_refptr<DevToolsAdbBridge> bridge_; |
| scoped_refptr<AndroidDevice> device_; |
| + std::string global_id_; |
| RemoteBrowsers browsers_; |
| DISALLOW_COPY_AND_ASSIGN(RemoteDevice); |
| @@ -183,12 +201,12 @@ class DevToolsAdbBridge |
| const CommandCallback& callback) = 0; |
| virtual void OpenSocket(const std::string& socket_name, |
| const SocketCallback& callback) = 0; |
| - virtual void HttpQuery(const std::string& la_name, |
| - const std::string& request, |
| - const CommandCallback& callback); |
| - virtual void HttpQuery(const std::string& la_name, |
| - const std::string& request, |
| - const SocketCallback& callback); |
| + void HttpQuery(const std::string& la_name, |
| + const std::string& request, |
| + const CommandCallback& callback); |
| + void HttpConnect(const std::string& la_name, |
| + const std::string& request, |
| + const SocketCallback& callback); |
| std::string serial() { return serial_; } |