Chromium Code Reviews| 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..e570c7126f0cddb337d74a494f2057a3de2cb218 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); |
| @@ -203,11 +202,11 @@ class DevToolsAndroidBridge |
| virtual ~RemoteDevice(); |
| scoped_refptr<DevToolsAndroidBridge> android_bridge_; |
| - std::string serial_; |
| - std::string model_; |
| - bool connected_; |
| + const std::string serial_; |
|
pfeldman
2014/05/13 12:44:58
We don't use const consistently in this code, why?
Vladislav Kaznacheev
2014/05/15 13:56:34
Removed.
On 2014/05/13 12:44:58, pfeldman wrote:
|
| + const std::string model_; |
| + const bool connected_; |
| RemoteBrowsers browsers_; |
| - gfx::Size screen_size_; |
| + const gfx::Size screen_size_; |
| DISALLOW_COPY_AND_ASSIGN(RemoteDevice); |
| }; |