Revert "Remote assistance on Chrome OS Part VIII - Compile on Ozone"

remoting/remoting_host.gypi

 # Copyright (c) 2012 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.
 
 {
   'includes': [
     'remoting_host_linux.gypi',
     'remoting_host_mac.gypi',
     'remoting_host_win.gypi',
   ],
 
   'variables': {
     'conditions': [
       # Remoting host is supported only on Windows, OSX and Linux (with X11).
       ['OS=="win" or OS=="mac" or (OS=="linux" and use_x11==1)', {
         'enable_me2me_host': 1,
         'enable_it2me_host': 1,
         'enable_remoting_host': 1,
       }, {
         'enable_me2me_host': 0,
         'enable_it2me_host': 0,
         'enable_remoting_host': 0,
       }],
-      ['chromeos==1', {
-        'enable_remoting_host': 1,
+      ['chromeos==1 and use_x11==1', {
         'enable_me2me_host': 0,
         'enable_it2me_host': 1,
       }],
     ],
   },
 
   'conditions': [
     ['enable_remoting_host==1', {
       'targets': [
         {
@@ skipping 18 matching lines @@
           'defines': [
             'HOST_BUNDLE_NAME="<(host_bundle_name)"',
             'PREFPANE_BUNDLE_NAME="<(prefpane_bundle_name)"',
             'VERSION=<(version_full)',
           ],
           'sources': [
             '<@(remoting_host_sources)',
           ],
           'conditions': [
             ['OS=="linux"', {
-              'conditions': [
-                ['use_x11==1', {
-                  'dependencies': [
-                    '../build/linux/system.gyp:x11',
-                    '../build/linux/system.gyp:xext',
-                    '../build/linux/system.gyp:xfixes',
-                    '../build/linux/system.gyp:xi',
-                    '../build/linux/system.gyp:xrandr',
-                    '../build/linux/system.gyp:xtst',
-                  ],
-                }],
-                ['chromeos==0 and use_ozone==0', {
-                  'dependencies': [
-                    # use GTK on Linux, even for Aura builds.
-                    '../build/linux/system.gyp:gtk',
-                  ],
-                }]
+              'dependencies': [
+                '../build/linux/system.gyp:x11',
+                '../build/linux/system.gyp:xext',
+                '../build/linux/system.gyp:xfixes',
+                '../build/linux/system.gyp:xi',
+                '../build/linux/system.gyp:xrandr',
+                '../build/linux/system.gyp:xtst',
               ],
               'link_settings': {
                 'libraries': [
                   '-lpam',
                 ],
               },
             }],
+            ['OS=="linux" and chromeos==0 and use_ozone==0', {
+              'dependencies' : [
+                # Always use GTK on Linux, even for Aura builds.
+                '../build/linux/system.gyp:gtk',
+              ],
+            }],
             ['chromeos==1', {
               'dependencies' : [
                 '../cc/cc.gyp:cc',
                 '../components/components.gyp:policy_component_common',
                 '../content/content.gyp:content',
                 '../ppapi/ppapi_internal.gyp:ppapi_host',
                 '../skia/skia.gyp:skia',
                 '../ui/aura/aura.gyp:aura',
                 '../ui/compositor/compositor.gyp:compositor',
                 '../ui/events/events.gyp:events',
-                '../ui/events/platform/events_platform.gyp:events_platform',
                 '../ui/views/views.gyp:views',
               ],
               'include_dirs': [
                 '../third_party/skia/include/utils',
               ],
               'sources!' : [
                 'host/clipboard_x11.cc',
                 'host/continue_window_linux.cc',
                 'host/disconnect_window_linux.cc',
-                'host/linux/x_server_clipboard.cc',
-                'host/linux/x_server_clipboard.h',
                 'host/policy_hack/policy_watcher_linux.cc',
                 'host/remoting_me2me_host.cc',
-              ],
-              'conditions': [
-                ['use_ozone==0', {
-                  'sources!': [
-                    'host/input_injector_chromeos.cc',
-                    'host/input_injector_chromeos.h',
-                    'host/local_input_monitor_chromeos.cc',
-                    'host/chromeos/mouse_cursor_monitor_aura.cc',
-                    'host/chromeos/mouse_cursor_monitor_aura.h',
-                  ],
-                }],
-              ],
+              ]
+            }, {  # chromeos==0
+               'sources!' : [
+                 'host/chromeos/aura_desktop_capturer.cc',
+                 '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',
+               ],
             }],
             ['OS=="mac"', {
               'dependencies': [
                 '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac',
               ],
               'link_settings': {
                 'libraries': [
                   '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
                   'libpam.a',
                ],
@@ skipping 586 matching lines @@
                 }],  # mac_breakpad==1
               ],  # conditions
             }],  # OS=mac
           ],
         },  # end of target 'remoting_it2me_native_messaging_host'
       ],  # end of 'targets'
     }],  # # end of OS!="win" and enable_it2me_host==1
 
   ],  # end of 'conditions'
 }