diff options
| author | raymes <raymes@chromium.org> | 2014-11-06 21:16:56 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-07 05:17:11 +0000 |
| commit | fd5030a219ce844d2d86bb2530dce9088e3c0523 (patch) | |
| tree | 5a8331c3940c7a5176c7d1904f6ec97648104e4f /remoting/remoting_host.gypi | |
| parent | dd4c8043fcb65e523f59e0b6e30fba322bf4c4f0 (diff) | |
| download | chromium_src-fd5030a219ce844d2d86bb2530dce9088e3c0523.zip chromium_src-fd5030a219ce844d2d86bb2530dce9088e3c0523.tar.gz chromium_src-fd5030a219ce844d2d86bb2530dce9088e3c0523.tar.bz2 | |
Revert of Remote assistance on Chrome OS Part VII - Clipboard Injection (patchset #5 id:100001 of https://codereview.chromium.org/704683002/)
Reason for revert:
Broke the asan bots: https://build.chromium.org/p/chromium.memory/builders/Linux%20Chromium%20OS%20ASan%20LSan%20Tests%20%281%29/builds/4106
Original issue's description:
> Remote assistance on Chrome OS Part VII - Clipboard Injection
>
> On Chrome OS, the clipboard is managed by aura instead of the underlying
> native platform (e.g. x11, ozone, etc).
>
> This CL introduces a class that
> 1) Monitors the aura clipboard on the host for changes and notifies the client clipboard.
> 2) Provides an interface to inject clipboard event into aura.
>
> The public API of this class can be called in any thread as internally it
> always posts the call to the |ui_task_runner|. On ChromeOS, that should
> be the UI thread of the browser process.
>
> BUG=424717
>
> Committed: https://crrev.com/7a468734170979bca9e48590267d2d123f0c0f84
> Cr-Commit-Position: refs/heads/master@{#303168}
TBR=dcaiafa@chromium.org,jamiewalch@chromium.org,wez@chromium.org,kelvinp@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=424717
Review URL: https://codereview.chromium.org/707913004
Cr-Commit-Position: refs/heads/master@{#303190}
Diffstat (limited to 'remoting/remoting_host.gypi')
| -rw-r--r-- | remoting/remoting_host.gypi | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/remoting/remoting_host.gypi b/remoting/remoting_host.gypi index 60e0c38..706f9739 100644 --- a/remoting/remoting_host.gypi +++ b/remoting/remoting_host.gypi @@ -90,8 +90,6 @@ 'host/client_session.h', 'host/client_session_control.h', 'host/clipboard.h', - 'host/clipboard_aura.cc', - 'host/clipboard_aura.h', 'host/clipboard_mac.mm', 'host/clipboard_win.cc', 'host/clipboard_x11.cc', @@ -339,11 +337,10 @@ '../third_party/skia/include/utils', ], 'sources!' : [ - 'host/clipboard_x11.cc', + 'host/policy_hack/policy_watcher_linux.cc', 'host/continue_window_linux.cc', 'host/disconnect_window.cc', 'host/disconnect_window_linux.cc', - 'host/policy_hack/policy_watcher_linux.cc', 'host/remoting_me2me_host.cc', ] }, { # chromeos==0 @@ -352,8 +349,6 @@ 'host/chromeos/aura_desktop_capturer.h', 'host/chromeos/message_box.cc', 'host/chromeos/message_box.h', - 'host/clipboard_aura.cc', - 'host/clipboard_aura.h', 'host/continue_window_chromeos.cc', 'host/disconnect_window_chromeos.cc', 'host/policy_hack/policy_watcher_chromeos.cc', |