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

Unified Diff: chrome/browser/devtools/devtools_adb_bridge.h

Issue 26436003: DevTools: display 'Pending authentication' message upon raw usb debugging. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review comment addressed. Created 7 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
« no previous file with comments | « chrome/browser/devtools/adb/android_usb_device.h ('k') | chrome/browser/devtools/devtools_adb_bridge.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 b4630b89548623c893172e835cf7d9d9244c9a89..0273e081d7396d3e3846a5341fba11fd7b629715 100644
--- a/chrome/browser/devtools/devtools_adb_bridge.h
+++ b/chrome/browser/devtools/devtools_adb_bridge.h
@@ -186,17 +186,15 @@ class DevToolsAdbBridge
public:
explicit RemoteDevice(scoped_refptr<AndroidDevice> device);
- scoped_refptr<AndroidDevice> device() { return device_; }
- std::string serial() { return device_->serial(); }
- std::string model() { return device_->model(); }
+ std::string GetSerial();
+ std::string GetModel();
+ bool IsConnected();
+ void AddBrowser(scoped_refptr<RemoteBrowser> browser);
+ scoped_refptr<AndroidDevice> device() { return device_; }
RemoteBrowsers& browsers() { return browsers_; }
- void AddBrowser(scoped_refptr<RemoteBrowser> browser) {
- browsers_.push_back(browser);
- }
-
- gfx::Size GetScreenSize() { return screen_size_; }
- void SetScreenSize(const gfx::Size& size) { screen_size_ = size; }
+ gfx::Size screen_size() { return screen_size_; }
+ void set_screen_size(const gfx::Size& size) { screen_size_ = size; }
private:
friend class base::RefCounted<RemoteDevice>;
@@ -219,6 +217,7 @@ class DevToolsAdbBridge
const CommandCallback& callback) = 0;
virtual void OpenSocket(const std::string& socket_name,
const SocketCallback& callback) = 0;
+ virtual bool IsConnected() = 0;
void HttpQuery(const std::string& la_name,
const std::string& request,
const CommandCallback& callback);
« no previous file with comments | « chrome/browser/devtools/adb/android_usb_device.h ('k') | chrome/browser/devtools/devtools_adb_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698