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

Unified Diff: remoting/protocol/clipboard_filter.cc

Issue 10860033: Allow input & clipboard filters to be disabled without NULLing target stub. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments and fix clipboard pipeline initialization. Created 8 years, 4 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
« no previous file with comments | « remoting/protocol/clipboard_filter.h ('k') | remoting/protocol/clipboard_filter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/clipboard_filter.cc
diff --git a/remoting/protocol/clipboard_filter.cc b/remoting/protocol/clipboard_filter.cc
index 4b4be959d3af52ff77ec414f84b12adfb033cd0d..d82547f8971316217ea4b5fbfd474a3104d2757c 100644
--- a/remoting/protocol/clipboard_filter.cc
+++ b/remoting/protocol/clipboard_filter.cc
@@ -8,7 +8,11 @@
namespace remoting {
namespace protocol {
-ClipboardFilter::ClipboardFilter() : clipboard_stub_(NULL) {
+ClipboardFilter::ClipboardFilter() : clipboard_stub_(NULL), enabled_(true) {
+}
+
+ClipboardFilter::ClipboardFilter(ClipboardStub* clipboard_stub)
+ : clipboard_stub_(clipboard_stub), enabled_(true) {
}
ClipboardFilter::~ClipboardFilter() {
@@ -19,7 +23,7 @@ void ClipboardFilter::set_clipboard_stub(ClipboardStub* clipboard_stub) {
}
void ClipboardFilter::InjectClipboardEvent(const ClipboardEvent& event) {
- if (clipboard_stub_ != NULL)
+ if (enabled_ && clipboard_stub_ != NULL)
clipboard_stub_->InjectClipboardEvent(event);
}
« no previous file with comments | « remoting/protocol/clipboard_filter.h ('k') | remoting/protocol/clipboard_filter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698