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

Side by Side Diff: remoting/host/clipboard_x11.cc

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/host/clipboard_win.cc ('k') | remoting/host/config_file_watcher.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "remoting/host/clipboard.h" 5 #include "remoting/host/clipboard.h"
6 6
7 #include <X11/Xlib.h> 7 #include <X11/Xlib.h>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/message_loop/message_loop.h" 11 #include "base/message_loop/message_loop.h"
12 #include "remoting/host/linux/x_server_clipboard.h" 12 #include "remoting/host/linux/x_server_clipboard.h"
13 #include "remoting/proto/event.pb.h" 13 #include "remoting/proto/event.pb.h"
14 #include "remoting/protocol/clipboard_stub.h" 14 #include "remoting/protocol/clipboard_stub.h"
15 15
16 namespace remoting { 16 namespace remoting {
17 17
18 // This code is expected to be called on the desktop thread only. 18 // This code is expected to be called on the desktop thread only.
19 class ClipboardX11 : public Clipboard, 19 class ClipboardX11 : public Clipboard,
20 public base::MessageLoopForIO::Watcher { 20 public base::MessageLoopForIO::Watcher {
21 public: 21 public:
22 ClipboardX11(); 22 ClipboardX11();
23 virtual ~ClipboardX11(); 23 virtual ~ClipboardX11();
24 24
25 // Clipboard interface. 25 // Clipboard interface.
26 virtual void Start( 26 virtual void Start(
27 scoped_ptr<protocol::ClipboardStub> client_clipboard) OVERRIDE; 27 scoped_ptr<protocol::ClipboardStub> client_clipboard) override;
28 virtual void InjectClipboardEvent( 28 virtual void InjectClipboardEvent(
29 const protocol::ClipboardEvent& event) OVERRIDE; 29 const protocol::ClipboardEvent& event) override;
30 virtual void Stop() OVERRIDE; 30 virtual void Stop() override;
31 31
32 // MessageLoopForIO::Watcher interface. 32 // MessageLoopForIO::Watcher interface.
33 virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE; 33 virtual void OnFileCanReadWithoutBlocking(int fd) override;
34 virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE; 34 virtual void OnFileCanWriteWithoutBlocking(int fd) override;
35 35
36 private: 36 private:
37 void OnClipboardChanged(const std::string& mime_type, 37 void OnClipboardChanged(const std::string& mime_type,
38 const std::string& data); 38 const std::string& data);
39 void PumpXEvents(); 39 void PumpXEvents();
40 40
41 scoped_ptr<protocol::ClipboardStub> client_clipboard_; 41 scoped_ptr<protocol::ClipboardStub> client_clipboard_;
42 42
43 // Underlying X11 clipboard implementation. 43 // Underlying X11 clipboard implementation.
44 XServerClipboard x_server_clipboard_; 44 XServerClipboard x_server_clipboard_;
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 XNextEvent(display_, &event); 125 XNextEvent(display_, &event);
126 x_server_clipboard_.ProcessXEvent(&event); 126 x_server_clipboard_.ProcessXEvent(&event);
127 } 127 }
128 } 128 }
129 129
130 scoped_ptr<Clipboard> Clipboard::Create() { 130 scoped_ptr<Clipboard> Clipboard::Create() {
131 return make_scoped_ptr(new ClipboardX11()); 131 return make_scoped_ptr(new ClipboardX11());
132 } 132 }
133 133
134 } // namespace remoting 134 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/clipboard_win.cc ('k') | remoting/host/config_file_watcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698