diff options
| author | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-12 16:44:23 +0000 |
|---|---|---|
| committer | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-12 16:44:23 +0000 |
| commit | b7fc8984a530feb9b988c76ac65494419f287bd4 (patch) | |
| tree | f7cdc032d96c63f75ca047423ff6ab1a95b07add /remoting | |
| parent | 207f754e95e5f2e5bf8679f646e4d82c613a2351 (diff) | |
| download | chromium_src-b7fc8984a530feb9b988c76ac65494419f287bd4.zip chromium_src-b7fc8984a530feb9b988c76ac65494419f287bd4.tar.gz chromium_src-b7fc8984a530feb9b988c76ac65494419f287bd4.tar.bz2 | |
Fix aura build for remoting_host
This is a quick fix to allow all remoting_host's dependent
targets to be built with use_aura=1. Eventually, the host
components will be updated to remove dependencies on GTK.
BUG=240809
TEST=Build all targets with 'use_aura=1'.
Review URL: https://chromiumcodereview.appspot.com/16403002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205822 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/host/continue_window_aura.cc | 12 | ||||
| -rw-r--r-- | remoting/host/disconnect_window_aura.cc | 12 | ||||
| -rw-r--r-- | remoting/remoting.gyp | 20 |
3 files changed, 37 insertions, 7 deletions
diff --git a/remoting/host/continue_window_aura.cc b/remoting/host/continue_window_aura.cc new file mode 100644 index 0000000..155ac87 --- /dev/null +++ b/remoting/host/continue_window_aura.cc @@ -0,0 +1,12 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "build/build_config.h" + +// TODO(lambroslambrou): Implement this for Aura - see http://crbug.com/247213. +#if defined(OS_LINUX) +#include "remoting/host/continue_window_gtk.cc" +#else +#error Not implemented. +#endif diff --git a/remoting/host/disconnect_window_aura.cc b/remoting/host/disconnect_window_aura.cc new file mode 100644 index 0000000..161aca0 --- /dev/null +++ b/remoting/host/disconnect_window_aura.cc @@ -0,0 +1,12 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "build/build_config.h" + +// TODO(lambroslambrou): Implement this for Aura - see http://crbug.com/247213. +#if defined(OS_LINUX) +#include "remoting/host/disconnect_window_gtk.cc" +#else +#error Not implemented. +#endif diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index aa574957..0ed274a 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -340,6 +340,7 @@ 'host/constants_mac.h', 'host/continue_window.cc', 'host/continue_window.h', + 'host/continue_window_aura.cc', 'host/continue_window_gtk.cc', 'host/continue_window_mac.mm', 'host/continue_window_win.cc', @@ -351,6 +352,7 @@ 'host/desktop_session_connector.h', 'host/desktop_session_proxy.cc', 'host/desktop_session_proxy.h', + 'host/disconnect_window_aura.cc', 'host/disconnect_window_gtk.cc', 'host/disconnect_window_mac.h', 'host/disconnect_window_mac.mm', @@ -483,16 +485,15 @@ 'host/win/wts_terminal_observer.h', ], 'conditions': [ - ['toolkit_uses_gtk==1', { + ['OS=="linux"', { 'dependencies': [ + # Always use GTK on Linux, even for Aura builds. + # + # TODO(lambroslambrou): Once the DisconnectWindow and + # ContinueWindow classes have been implemented for Aura, + # remove this dependency. '../build/linux/system.gyp:gtk', ], - }, { # else toolkit_uses_gtk!=1 - 'sources!': [ - '*_gtk.cc', - ], - }], - ['OS=="linux"', { 'link_settings': { 'libraries': [ '-lX11', @@ -504,6 +505,11 @@ '-lpam', ], }, + }, { # else OS != "linux" + 'sources!': [ + 'host/continue_window_aura.cc', + 'host/disconnect_window_aura.cc', + ], }], ['OS=="mac"', { 'sources': [ |