| Index: chrome/browser/devtools/device/devtools_android_bridge.h
|
| diff --git a/chrome/browser/devtools/device/devtools_android_bridge.h b/chrome/browser/devtools/device/devtools_android_bridge.h
|
| index d35f8e1c91b166f5e1f370cf88243b1da2417951..c264e904dfba6857d5a86fb71bd277969029af56 100644
|
| --- a/chrome/browser/devtools/device/devtools_android_bridge.h
|
| +++ b/chrome/browser/devtools/device/devtools_android_bridge.h
|
| @@ -112,7 +112,7 @@ class DevToolsAndroidBridge
|
| RemoteBrowser(
|
| scoped_refptr<DevToolsAndroidBridge> android_bridge,
|
| const std::string& serial,
|
| - const std::string& socket);
|
| + const AndroidDeviceManager::BrowserInfo& browser_info);
|
|
|
| std::string serial() { return serial_; }
|
| std::string socket() { return socket_; }
|
| @@ -124,6 +124,7 @@ class DevToolsAndroidBridge
|
| void set_version(const std::string& version) { version_ = version; }
|
|
|
| bool IsChrome() const;
|
| + bool IsWebView() const;
|
|
|
| typedef std::vector<int> ParsedVersion;
|
| ParsedVersion GetParsedVersion() const;
|
| @@ -171,6 +172,7 @@ class DevToolsAndroidBridge
|
| const std::string serial_;
|
| const std::string socket_;
|
| std::string display_name_;
|
| + const AndroidDeviceManager::BrowserInfo::Type type_;
|
| std::string version_;
|
| scoped_ptr<base::ListValue> page_descriptors_;
|
|
|
| @@ -183,17 +185,14 @@ class DevToolsAndroidBridge
|
| public:
|
| RemoteDevice(scoped_refptr<DevToolsAndroidBridge> android_bridge,
|
| const std::string& serial,
|
| - const std::string& model,
|
| + const AndroidDeviceManager::DeviceInfo& device_info,
|
| bool connected);
|
|
|
| std::string serial() { return serial_; }
|
| std::string model() { return model_; }
|
| bool is_connected() { return connected_; }
|
| - void AddBrowser(scoped_refptr<RemoteBrowser> browser);
|
| -
|
| RemoteBrowsers& browsers() { return browsers_; }
|
| gfx::Size screen_size() { return screen_size_; }
|
| - void set_screen_size(const gfx::Size& size) { screen_size_ = size; }
|
|
|
| void OpenSocket(const std::string& socket_name,
|
| const AndroidDeviceManager::SocketCallback& callback);
|
|
|