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

Side by Side Diff: chrome/browser/devtools/device/android_web_socket.cc

Issue 625113002: replace OVERRIDE and FINAL with override and final in chrome/browser/[a-i]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix newly added OVERRIDEs Created 6 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 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/memory/weak_ptr.h" 5 #include "base/memory/weak_ptr.h"
6 #include "base/message_loop/message_loop.h" 6 #include "base/message_loop/message_loop.h"
7 #include "base/rand_util.h" 7 #include "base/rand_util.h"
8 #include "chrome/browser/devtools/device/android_device_manager.h" 8 #include "chrome/browser/devtools/device/android_device_manager.h"
9 #include "content/public/browser/browser_thread.h" 9 #include "content/public/browser/browser_thread.h"
10 #include "net/base/io_buffer.h" 10 #include "net/base/io_buffer.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 public: 46 public:
47 DelegateWrapper(base::WeakPtr<Delegate> weak_delegate, 47 DelegateWrapper(base::WeakPtr<Delegate> weak_delegate,
48 scoped_refptr<base::MessageLoopProxy> message_loop) 48 scoped_refptr<base::MessageLoopProxy> message_loop)
49 : weak_delegate_(weak_delegate), 49 : weak_delegate_(weak_delegate),
50 message_loop_(message_loop) { 50 message_loop_(message_loop) {
51 } 51 }
52 52
53 virtual ~DelegateWrapper() {} 53 virtual ~DelegateWrapper() {}
54 54
55 // AndroidWebSocket::Delegate implementation 55 // AndroidWebSocket::Delegate implementation
56 virtual void OnSocketOpened() OVERRIDE { 56 virtual void OnSocketOpened() override {
57 message_loop_->PostTask(FROM_HERE, 57 message_loop_->PostTask(FROM_HERE,
58 base::Bind(&Delegate::OnSocketOpened, weak_delegate_)); 58 base::Bind(&Delegate::OnSocketOpened, weak_delegate_));
59 } 59 }
60 60
61 virtual void OnFrameRead(const std::string& message) OVERRIDE { 61 virtual void OnFrameRead(const std::string& message) override {
62 message_loop_->PostTask(FROM_HERE, 62 message_loop_->PostTask(FROM_HERE,
63 base::Bind(&Delegate::OnFrameRead, weak_delegate_, message)); 63 base::Bind(&Delegate::OnFrameRead, weak_delegate_, message));
64 } 64 }
65 65
66 virtual void OnSocketClosed() OVERRIDE { 66 virtual void OnSocketClosed() override {
67 message_loop_->PostTask(FROM_HERE, 67 message_loop_->PostTask(FROM_HERE,
68 base::Bind(&Delegate::OnSocketClosed, weak_delegate_)); 68 base::Bind(&Delegate::OnSocketClosed, weak_delegate_));
69 } 69 }
70 70
71 private: 71 private:
72 base::WeakPtr<Delegate> weak_delegate_; 72 base::WeakPtr<Delegate> weak_delegate_;
73 scoped_refptr<base::MessageLoopProxy> message_loop_; 73 scoped_refptr<base::MessageLoopProxy> message_loop_;
74 }; 74 };
75 75
76 class AndroidWebSocketImpl 76 class AndroidWebSocketImpl
77 : public AndroidDeviceManager::AndroidWebSocket, 77 : public AndroidDeviceManager::AndroidWebSocket,
78 public AndroidDeviceManager::AndroidWebSocket::Delegate { 78 public AndroidDeviceManager::AndroidWebSocket::Delegate {
79 public: 79 public:
80 typedef AndroidDeviceManager::Device Device; 80 typedef AndroidDeviceManager::Device Device;
81 AndroidWebSocketImpl( 81 AndroidWebSocketImpl(
82 scoped_refptr<base::MessageLoopProxy> device_message_loop, 82 scoped_refptr<base::MessageLoopProxy> device_message_loop,
83 scoped_refptr<Device> device, 83 scoped_refptr<Device> device,
84 const std::string& socket_name, 84 const std::string& socket_name,
85 const std::string& url, 85 const std::string& url,
86 AndroidWebSocket::Delegate* delegate); 86 AndroidWebSocket::Delegate* delegate);
87 87
88 virtual ~AndroidWebSocketImpl(); 88 virtual ~AndroidWebSocketImpl();
89 89
90 // AndroidWebSocket implementation 90 // AndroidWebSocket implementation
91 virtual void SendFrame(const std::string& message) OVERRIDE; 91 virtual void SendFrame(const std::string& message) override;
92 92
93 // AndroidWebSocket::Delegate implementation 93 // AndroidWebSocket::Delegate implementation
94 virtual void OnSocketOpened() OVERRIDE; 94 virtual void OnSocketOpened() override;
95 virtual void OnFrameRead(const std::string& message) OVERRIDE; 95 virtual void OnFrameRead(const std::string& message) override;
96 virtual void OnSocketClosed() OVERRIDE; 96 virtual void OnSocketClosed() override;
97 97
98 private: 98 private:
99 void Connected(int result, scoped_ptr<net::StreamSocket> socket); 99 void Connected(int result, scoped_ptr<net::StreamSocket> socket);
100 100
101 scoped_refptr<base::MessageLoopProxy> device_message_loop_; 101 scoped_refptr<base::MessageLoopProxy> device_message_loop_;
102 scoped_refptr<Device> device_; 102 scoped_refptr<Device> device_;
103 std::string socket_name_; 103 std::string socket_name_;
104 std::string url_; 104 std::string url_;
105 WebSocketImpl* connection_; 105 WebSocketImpl* connection_;
106 DelegateWrapper* delegate_wrapper_; 106 DelegateWrapper* delegate_wrapper_;
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 } // namespace 271 } // namespace
272 272
273 AndroidDeviceManager::AndroidWebSocket* 273 AndroidDeviceManager::AndroidWebSocket*
274 AndroidDeviceManager::Device::CreateWebSocket( 274 AndroidDeviceManager::Device::CreateWebSocket(
275 const std::string& socket, 275 const std::string& socket,
276 const std::string& url, 276 const std::string& url,
277 AndroidDeviceManager::AndroidWebSocket::Delegate* delegate) { 277 AndroidDeviceManager::AndroidWebSocket::Delegate* delegate) {
278 return new AndroidWebSocketImpl( 278 return new AndroidWebSocketImpl(
279 device_message_loop_, this, socket, url, delegate); 279 device_message_loop_, this, socket, url, delegate);
280 } 280 }
OLDNEW
« no previous file with comments | « chrome/browser/devtools/device/adb/mock_adb_server.cc ('k') | chrome/browser/devtools/device/devtools_android_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698