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

Side by Side 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 unified diff | Download patch
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 #include "base/message_loop/message_loop.h" 5 #include "base/message_loop/message_loop.h"
6 #include "base/rand_util.h" 6 #include "base/rand_util.h"
7 #include "chrome/browser/devtools/device/devtools_android_bridge.h" 7 #include "chrome/browser/devtools/device/devtools_android_bridge.h"
8 #include "content/public/browser/browser_thread.h" 8 #include "content/public/browser/browser_thread.h"
9 #include "net/base/io_buffer.h" 9 #include "net/base/io_buffer.h"
10 #include "net/base/net_errors.h" 10 #include "net/base/net_errors.h"
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 delegate_->OnFrameRead(message); 218 delegate_->OnFrameRead(message);
219 } 219 }
220 220
221 void WebSocketImpl::OnSocketClosed(bool closed_by_device) { 221 void WebSocketImpl::OnSocketClosed(bool closed_by_device) {
222 delegate_->OnSocketClosed(closed_by_device); 222 delegate_->OnSocketClosed(closed_by_device);
223 } 223 }
224 224
225 } // namespace 225 } // namespace
226 226
227 scoped_refptr<DevToolsAndroidBridge::AndroidWebSocket> 227 scoped_refptr<DevToolsAndroidBridge::AndroidWebSocket>
228 DevToolsAndroidBridge::RemoteBrowser::CreateWebSocket( 228 DevToolsAndroidBridge::DeviceHandle::CreateWebSocket(
229 const std::string& socket,
229 const std::string& url, 230 const std::string& url,
230 DevToolsAndroidBridge::AndroidWebSocket::Delegate* delegate) { 231 DevToolsAndroidBridge::AndroidWebSocket::Delegate* delegate) {
231 return new WebSocketImpl( 232 return new WebSocketImpl(
232 android_bridge_, 233 android_bridge_,
233 android_bridge_->device_manager(), 234 android_bridge_->device_manager(),
234 android_bridge_->device_message_loop(), 235 android_bridge_->device_message_loop(),
235 serial_, socket_, url, delegate); 236 serial_, socket, url, delegate);
236 } 237 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698