Mojo JS Bindings: merge Application, Shell, ServiceProvider with Sky

sky/tools/skydb

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 from skypy.paths import Paths
 from skypy.skyserver import SkyServer
 import argparse
 import logging
 import os
@@ skipping 36 matching lines @@
         return os.environ.get('CHROME_REMOTE_DESKTOP_SESSION', False)
 
     def main(self):
         logging.basicConfig(level=logging.INFO)
 
         parser = argparse.ArgumentParser(description='Sky launcher/debugger')
         parser.add_argument('--gdb', action='store_true')
         parser.add_argument('--use-osmesa', action='store_true',
             default=self._in_chromoting())
         parser.add_argument('url_or_path', nargs='?', type=str)
+        parser.add_argument('--show-command', action='store_true',
+            help='Display the shell command and exit')
         configuration.add_arguments(parser)
         args = parser.parse_args()
 
         self.paths = Paths(os.path.join('out', args.configuration))
 
         content_handlers = ['%s,%s' % (mime_type, 'mojo:sky_viewer')
             for mime_type in SUPPORTED_MIME_TYPES]
         shell_command = [
             self.paths.mojo_shell_path,
             '--v=1',
@@ skipping 15 matching lines @@
 
         if args.gdb:
             shell_command = ['gdb', '--args'] + shell_command
 
         if server_root:
             with SkyServer(self.paths, HTTP_PORT, args.configuration,
                     server_root):
                 subprocess.check_call(shell_command)
         else:
             subprocess.check_call(shell_command)
+        if args.show_command:
+            print " ".join(shell_command)
+        else:
+            subprocess.check_call(shell_command)
+
+    def shutdown(self):

[eseidel, 2015/01/08 19:30:29]

This code looks unused?

[hansmuller1, 2015/01/08 21:31:14]

It looks the result of a bad merge (mine). You removed this method in
https://codereview.chromium.org/817573003; it should have stayed removed.

+        print "Quitting"
+        if self._sky_server:
+            self._sky_server.terminate()
 
 
 if __name__ == '__main__':
     SkyDebugger().main()