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

Side by Side Diff: remoting/client/jni/chromoting_jni_instance.h

Issue 628753002: replace OVERRIDE and FINAL with override and final in remoting/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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
« no previous file with comments | « remoting/client/frame_consumer_proxy.h ('k') | remoting/client/jni/jni_frame_consumer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #ifndef REMOTING_CLIENT_CHROMOTING_JNI_INSTANCE_H_ 5 #ifndef REMOTING_CLIENT_CHROMOTING_JNI_INSTANCE_H_
6 #define REMOTING_CLIENT_CHROMOTING_JNI_INSTANCE_H_ 6 #define REMOTING_CLIENT_CHROMOTING_JNI_INSTANCE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 89
90 void SendClientMessage(const std::string& type, const std::string& data); 90 void SendClientMessage(const std::string& type, const std::string& data);
91 91
92 // Records paint time for statistics logging, if enabled. May be called from 92 // Records paint time for statistics logging, if enabled. May be called from
93 // any thread. 93 // any thread.
94 void RecordPaintTime(int64 paint_time_ms); 94 void RecordPaintTime(int64 paint_time_ms);
95 95
96 // ClientUserInterface implementation. 96 // ClientUserInterface implementation.
97 virtual void OnConnectionState( 97 virtual void OnConnectionState(
98 protocol::ConnectionToHost::State state, 98 protocol::ConnectionToHost::State state,
99 protocol::ErrorCode error) OVERRIDE; 99 protocol::ErrorCode error) override;
100 virtual void OnConnectionReady(bool ready) OVERRIDE; 100 virtual void OnConnectionReady(bool ready) override;
101 virtual void OnRouteChanged(const std::string& channel_name, 101 virtual void OnRouteChanged(const std::string& channel_name,
102 const protocol::TransportRoute& route) OVERRIDE; 102 const protocol::TransportRoute& route) override;
103 virtual void SetCapabilities(const std::string& capabilities) OVERRIDE; 103 virtual void SetCapabilities(const std::string& capabilities) override;
104 virtual void SetPairingResponse( 104 virtual void SetPairingResponse(
105 const protocol::PairingResponse& response) OVERRIDE; 105 const protocol::PairingResponse& response) override;
106 virtual void DeliverHostMessage( 106 virtual void DeliverHostMessage(
107 const protocol::ExtensionMessage& message) OVERRIDE; 107 const protocol::ExtensionMessage& message) override;
108 virtual protocol::ClipboardStub* GetClipboardStub() OVERRIDE; 108 virtual protocol::ClipboardStub* GetClipboardStub() override;
109 virtual protocol::CursorShapeStub* GetCursorShapeStub() OVERRIDE; 109 virtual protocol::CursorShapeStub* GetCursorShapeStub() override;
110 110
111 // CursorShapeStub implementation. 111 // CursorShapeStub implementation.
112 virtual void InjectClipboardEvent( 112 virtual void InjectClipboardEvent(
113 const protocol::ClipboardEvent& event) OVERRIDE; 113 const protocol::ClipboardEvent& event) override;
114 114
115 // ClipboardStub implementation. 115 // ClipboardStub implementation.
116 virtual void SetCursorShape(const protocol::CursorShapeInfo& shape) OVERRIDE; 116 virtual void SetCursorShape(const protocol::CursorShapeInfo& shape) override;
117 117
118 private: 118 private:
119 // This object is ref-counted, so it cleans itself up. 119 // This object is ref-counted, so it cleans itself up.
120 virtual ~ChromotingJniInstance(); 120 virtual ~ChromotingJniInstance();
121 121
122 void ConnectToHostOnDisplayThread(); 122 void ConnectToHostOnDisplayThread();
123 void ConnectToHostOnNetworkThread(); 123 void ConnectToHostOnNetworkThread();
124 void DisconnectFromHostOnNetworkThread(); 124 void DisconnectFromHostOnNetworkThread();
125 125
126 // Notifies the user interface that the user needs to enter a PIN. The 126 // Notifies the user interface that the user needs to enter a PIN. The
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 friend class base::RefCountedThreadSafe<ChromotingJniInstance>; 191 friend class base::RefCountedThreadSafe<ChromotingJniInstance>;
192 192
193 base::WeakPtrFactory<ChromotingJniInstance> weak_factory_; 193 base::WeakPtrFactory<ChromotingJniInstance> weak_factory_;
194 194
195 DISALLOW_COPY_AND_ASSIGN(ChromotingJniInstance); 195 DISALLOW_COPY_AND_ASSIGN(ChromotingJniInstance);
196 }; 196 };
197 197
198 } // namespace remoting 198 } // namespace remoting
199 199
200 #endif 200 #endif
OLDNEW
« no previous file with comments | « remoting/client/frame_consumer_proxy.h ('k') | remoting/client/jni/jni_frame_consumer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698