Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(359)

Side by Side Diff: chrome/browser/devtools/device/devtools_device_discovery.h

Issue 2575363002: Fixed not working inspector in case of Remote Target (Closed)
Patch Set: Fixed not working inspector in case of Remote Target Created 3 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « AUTHORS ('k') | chrome/browser/devtools/device/devtools_device_discovery.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_DEVTOOLS_DEVICE_DEVTOOLS_DEVICE_DISCOVERY_H_ 5 #ifndef CHROME_BROWSER_DEVTOOLS_DEVICE_DEVTOOLS_DEVICE_DISCOVERY_H_
6 #define CHROME_BROWSER_DEVTOOLS_DEVICE_DEVTOOLS_DEVICE_DISCOVERY_H_ 6 #define CHROME_BROWSER_DEVTOOLS_DEVICE_DEVTOOLS_DEVICE_DISCOVERY_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 45
46 using RemotePages = std::vector<scoped_refptr<RemotePage>>; 46 using RemotePages = std::vector<scoped_refptr<RemotePage>>;
47 47
48 class RemoteBrowser : public base::RefCounted<RemoteBrowser> { 48 class RemoteBrowser : public base::RefCounted<RemoteBrowser> {
49 public: 49 public:
50 const std::string& serial() { return serial_; } 50 const std::string& serial() { return serial_; }
51 const std::string& socket() { return browser_id_; } 51 const std::string& socket() { return browser_id_; }
52 const std::string& display_name() { return display_name_; } 52 const std::string& display_name() { return display_name_; }
53 const std::string& user() { return user_; } 53 const std::string& user() { return user_; }
54 const std::string& version() { return version_; } 54 const std::string& version() { return version_; }
55 const std::string& webkit_version() { return webkit_version_; }
55 const RemotePages& pages() { return pages_; } 56 const RemotePages& pages() { return pages_; }
56 57
57 bool IsChrome(); 58 bool IsChrome();
58 std::string GetId(); 59 std::string GetId();
59 60
60 using ParsedVersion = std::vector<int>; 61 using ParsedVersion = std::vector<int>;
61 ParsedVersion GetParsedVersion(); 62 ParsedVersion GetParsedVersion();
63 std::string WebKitRevision();
62 64
63 private: 65 private:
64 friend class base::RefCounted<RemoteBrowser>; 66 friend class base::RefCounted<RemoteBrowser>;
65 friend class DevToolsDeviceDiscovery; 67 friend class DevToolsDeviceDiscovery;
66 68
67 RemoteBrowser(const std::string& serial, 69 RemoteBrowser(const std::string& serial,
68 const AndroidDeviceManager::BrowserInfo& browser_info); 70 const AndroidDeviceManager::BrowserInfo& browser_info);
69 71
70 virtual ~RemoteBrowser(); 72 virtual ~RemoteBrowser();
71 73
72 std::string serial_; 74 std::string serial_;
73 std::string browser_id_; 75 std::string browser_id_;
74 std::string display_name_; 76 std::string display_name_;
75 std::string user_; 77 std::string user_;
76 AndroidDeviceManager::BrowserInfo::Type type_; 78 AndroidDeviceManager::BrowserInfo::Type type_;
77 std::string version_; 79 std::string version_;
80 std::string webkit_version_;
78 RemotePages pages_; 81 RemotePages pages_;
79 82
80 DISALLOW_COPY_AND_ASSIGN(RemoteBrowser); 83 DISALLOW_COPY_AND_ASSIGN(RemoteBrowser);
81 }; 84 };
82 85
83 using RemoteBrowsers = std::vector<scoped_refptr<RemoteBrowser>>; 86 using RemoteBrowsers = std::vector<scoped_refptr<RemoteBrowser>>;
84 87
85 class RemoteDevice : public base::RefCounted<RemoteDevice> { 88 class RemoteDevice : public base::RefCounted<RemoteDevice> {
86 public: 89 public:
87 std::string serial() { return serial_; } 90 std::string serial() { return serial_; }
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 138
136 AndroidDeviceManager* device_manager_; 139 AndroidDeviceManager* device_manager_;
137 const DeviceListCallback callback_; 140 const DeviceListCallback callback_;
138 base::Callback<void(const base::Closure&)> task_scheduler_; 141 base::Callback<void(const base::Closure&)> task_scheduler_;
139 base::WeakPtrFactory<DevToolsDeviceDiscovery> weak_factory_; 142 base::WeakPtrFactory<DevToolsDeviceDiscovery> weak_factory_;
140 143
141 DISALLOW_COPY_AND_ASSIGN(DevToolsDeviceDiscovery); 144 DISALLOW_COPY_AND_ASSIGN(DevToolsDeviceDiscovery);
142 }; 145 };
143 146
144 #endif // CHROME_BROWSER_DEVTOOLS_DEVICE_DEVTOOLS_DEVICE_DISCOVERY_H_ 147 #endif // CHROME_BROWSER_DEVTOOLS_DEVICE_DEVTOOLS_DEVICE_DISCOVERY_H_
OLDNEW
« no previous file with comments | « AUTHORS ('k') | chrome/browser/devtools/device/devtools_device_discovery.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698