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

Unified Diff: chrome/browser/devtools/device/devtools_device_discovery.h

Issue 2431483003: [DevTools] Split device discovery off DevToolsAnrdoidBridge. (Closed)
Patch Set: the bug with invalid weak pointer Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/devtools/device/devtools_device_discovery.h
diff --git a/chrome/browser/devtools/device/devtools_device_discovery.h b/chrome/browser/devtools/device/devtools_device_discovery.h
new file mode 100644
index 0000000000000000000000000000000000000000..ce4a4e7e67c898e570fc98d15b3eb879f64e2a69
--- /dev/null
+++ b/chrome/browser/devtools/device/devtools_device_discovery.h
@@ -0,0 +1,147 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_BROWSER_DEVTOOLS_DEVICE_DEVTOOLS_DEVICE_DISCOVERY_H_
+#define CHROME_BROWSER_DEVTOOLS_DEVICE_DEVTOOLS_DEVICE_DISCOVERY_H_
+
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "base/callback.h"
+#include "base/macros.h"
+#include "base/memory/ref_counted.h"
+#include "base/memory/weak_ptr.h"
+#include "chrome/browser/devtools/device/android_device_manager.h"
+#include "content/public/browser/devtools_agent_host.h"
+
+class DevToolsDeviceDiscovery {
+ public:
+ class RemotePage : public base::RefCounted<RemotePage> {
+ public:
+ scoped_refptr<AndroidDeviceManager::Device> device() { return device_; }
+ const std::string& socket() { return browser_id_; }
+ const std::string& frontend_url() { return frontend_url_; }
+ scoped_refptr<content::DevToolsAgentHost> CreateTarget();
+
+ private:
+ friend class base::RefCounted<RemotePage>;
+ friend class DevToolsDeviceDiscovery;
+
+ RemotePage(scoped_refptr<AndroidDeviceManager::Device> device,
+ const std::string& browser_id,
+ const base::DictionaryValue& dict);
+
+ virtual ~RemotePage();
+
+ scoped_refptr<AndroidDeviceManager::Device> device_;
+ std::string browser_id_;
+ std::string frontend_url_;
+ std::unique_ptr<base::DictionaryValue> dict_;
+
+ DISALLOW_COPY_AND_ASSIGN(RemotePage);
+ };
+
+ using RemotePages = std::vector<scoped_refptr<RemotePage>>;
+
+ class RemoteBrowser : public base::RefCounted<RemoteBrowser> {
+ public:
+ const std::string& serial() { return serial_; }
+ const std::string& socket() { return browser_id_; }
+ const std::string& display_name() { return display_name_; }
+ const std::string& user() { return user_; }
+ const std::string& version() { return version_; }
+ const RemotePages& pages() { return pages_; }
+
+ bool IsChrome();
+ std::string GetId();
+
+ using ParsedVersion = std::vector<int>;
+ ParsedVersion GetParsedVersion();
+
+ private:
+ friend class base::RefCounted<RemoteBrowser>;
+ friend class DevToolsDeviceDiscovery;
+
+ RemoteBrowser(const std::string& serial,
+ const AndroidDeviceManager::BrowserInfo& browser_info);
+
+ virtual ~RemoteBrowser();
+
+ std::string serial_;
+ std::string browser_id_;
+ std::string display_name_;
+ std::string user_;
+ AndroidDeviceManager::BrowserInfo::Type type_;
+ std::string version_;
+ RemotePages pages_;
+
+ DISALLOW_COPY_AND_ASSIGN(RemoteBrowser);
+ };
+
+ using RemoteBrowsers = std::vector<scoped_refptr<RemoteBrowser>>;
+
+ class RemoteDevice : public base::RefCounted<RemoteDevice> {
+ public:
+ std::string serial() { return serial_; }
+ std::string model() { return model_; }
+ bool is_connected() { return connected_; }
+ RemoteBrowsers& browsers() { return browsers_; }
+ gfx::Size screen_size() { return screen_size_; }
+
+ private:
+ friend class base::RefCounted<RemoteDevice>;
+ friend class DevToolsDeviceDiscovery;
+
+ RemoteDevice(const std::string& serial,
+ const AndroidDeviceManager::DeviceInfo& device_info);
+
+ virtual ~RemoteDevice();
+
+ std::string serial_;
+ std::string model_;
+ bool connected_;
+ RemoteBrowsers browsers_;
+ gfx::Size screen_size_;
+
+ DISALLOW_COPY_AND_ASSIGN(RemoteDevice);
+ };
+
+ using RemoteDevices = std::vector<scoped_refptr<RemoteDevice>>;
+
+ using CompleteDevice =
+ std::pair<scoped_refptr<AndroidDeviceManager::Device>,
+ scoped_refptr<RemoteDevice>>;
+ using CompleteDevices = std::vector<CompleteDevice>;
+ using DeviceListCallback = base::Callback<void(const CompleteDevices&)>;
+
+ DevToolsDeviceDiscovery(
+ AndroidDeviceManager* device_manager,
+ const DeviceListCallback& callback);
+ ~DevToolsDeviceDiscovery();
+
+ void SetScheduler(base::Callback<void(const base::Closure&)> scheduler);
+
+ static void DiscoverOnce(
+ AndroidDeviceManager* device_manager,
+ const DeviceListCallback& callback);
+ static scoped_refptr<content::DevToolsAgentHost> CreateBrowserAgentHost(
+ scoped_refptr<AndroidDeviceManager::Device> device,
+ scoped_refptr<RemoteBrowser> browser);
+
+ private:
+ class DiscoveryRequest;
+
+ void RequestDeviceList();
+ void ReceivedDeviceList(const CompleteDevices& complete_devices);
+
+ AndroidDeviceManager* device_manager_;
+ const DeviceListCallback callback_;
+ base::Callback<void(const base::Closure&)> task_scheduler_;
+ base::WeakPtrFactory<DevToolsDeviceDiscovery> weak_factory_;
+
+ DISALLOW_COPY_AND_ASSIGN(DevToolsDeviceDiscovery);
+};
+
+#endif // CHROME_BROWSER_DEVTOOLS_DEVICE_DEVTOOLS_DEVICE_DISCOVERY_H_
« no previous file with comments | « chrome/browser/devtools/device/devtools_android_bridge.cc ('k') | chrome/browser/devtools/device/devtools_device_discovery.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698