summaryrefslogtreecommitdiffstats
path: root/remoting/remoting_host.gypi
diff options
context:
space:
mode:
authorkelvinp <kelvinp@chromium.org>2014-11-04 15:27:03 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-04 23:27:21 +0000
commitf469112851afa11cb3894451a2b4f9724682ffbd (patch)
treea53d86084c7e6193ae87cd9664bc67cebaff5c6f /remoting/remoting_host.gypi
parentdb77a378271ce5c42052a86c52f255a5e784fa32 (diff)
downloadchromium_src-f469112851afa11cb3894451a2b4f9724682ffbd.zip
chromium_src-f469112851afa11cb3894451a2b4f9724682ffbd.tar.gz
chromium_src-f469112851afa11cb3894451a2b4f9724682ffbd.tar.bz2
Remote assistance on Chrome OS Part V - It2MeHost Continue Window
This CL implements the ContinueWindow on ChromeOS, which will be shown to the user for confirmation after 10 minutes into a Remote Assistance session. To implement the ContinueWindow, this CL introduces a new class MessageBox, which is a re-usable component built on top of the widget framework. BUG=424908 Committed: https://crrev.com/6410d7ad4937a4a86e9ad28b9ecf99f961305b2d Cr-Commit-Position: refs/heads/master@{#302657} Review URL: https://codereview.chromium.org/690183002 Cr-Commit-Position: refs/heads/master@{#302706}
Diffstat (limited to 'remoting/remoting_host.gypi')
-rw-r--r--remoting/remoting_host.gypi6
1 files changed, 6 insertions, 0 deletions
diff --git a/remoting/remoting_host.gypi b/remoting/remoting_host.gypi
index d4e2406..706f9739 100644
--- a/remoting/remoting_host.gypi
+++ b/remoting/remoting_host.gypi
@@ -74,6 +74,8 @@
'host/capture_scheduler.h',
'host/chromeos/aura_desktop_capturer.cc',
'host/chromeos/aura_desktop_capturer.h',
+ 'host/chromeos/message_box.cc',
+ 'host/chromeos/message_box.h',
'host/chromium_port_allocator_factory.cc',
'host/chromium_port_allocator_factory.h',
'host/chromoting_host.cc',
@@ -328,6 +330,8 @@
'../skia/skia.gyp:skia',
'../ui/aura/aura.gyp:aura',
'../ui/compositor/compositor.gyp:compositor',
+ '../ui/events/events.gyp:events',
+ '../ui/views/views.gyp:views',
],
'include_dirs': [
'../third_party/skia/include/utils',
@@ -343,6 +347,8 @@
'sources!' : [
'host/chromeos/aura_desktop_capturer.cc',
'host/chromeos/aura_desktop_capturer.h',
+ 'host/chromeos/message_box.cc',
+ 'host/chromeos/message_box.h',
'host/continue_window_chromeos.cc',
'host/disconnect_window_chromeos.cc',
'host/policy_hack/policy_watcher_chromeos.cc',