chrome/browser/devtools/device/android_web_socket.cc - Issue 287643002: DevTools: Partially redesigned DevToolsAndroidBridge and AndroidDeviceManager

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/devtools/device/android_web_socket.cc

Issue 287643002: DevTools: Partially redesigned DevToolsAndroidBridge and AndroidDeviceManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Used scoped_ptr. Fixed DeviceHandle destruction Created 6 years, 7 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

« chrome/browser/devtools/device/android_device_manager.cc ('K') | « chrome/browser/devtools/device/android_device_manager.cc ('k') | chrome/browser/devtools/device/devtools_android_bridge.h » ('j') | chrome/browser/devtools/device/devtools_android_bridge.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/devtools/device/android_web_socket.cc

diff --git a/chrome/browser/devtools/device/android_web_socket.cc b/chrome/browser/devtools/device/android_web_socket.cc

index d08cd2c4ef5dd1a51b58b026ac0991280da25194..01865dacb8423950e0b67a1fbf168b911ca85a6b 100644

--- a/chrome/browser/devtools/device/android_web_socket.cc

+++ b/chrome/browser/devtools/device/android_web_socket.cc

@@ -225,12 +225,13 @@ void WebSocketImpl::OnSocketClosed(bool closed_by_device) {

} // namespace

scoped_refptr<DevToolsAndroidBridge::AndroidWebSocket>

-DevToolsAndroidBridge::RemoteBrowser::CreateWebSocket(

+DevToolsAndroidBridge::DeviceHandle::CreateWebSocket(

+ const std::string& socket,

const std::string& url,

DevToolsAndroidBridge::AndroidWebSocket::Delegate* delegate) {

return new WebSocketImpl(

android_bridge_,

android_bridge_->device_manager(),

android_bridge_->device_message_loop(),

- serial_, socket_, url, delegate);

+ serial_, socket, url, delegate);

}