Revert 272983 "Change Shell / ShellClient to ServiceProvider"

trunk/src/mojo/apps/js/main.js

 // 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.
 
 define([
     'console',
     'monotonic_clock',
     'timer',
     'mojo/public/js/bindings/connection',
     'mojo/public/js/bindings/core',
     'mojo/apps/js/bindings/gl',
     'mojo/apps/js/bindings/threading',
     'mojo/services/native_viewport/native_viewport.mojom',
-    'mojo/public/interfaces/service_provider/service_provider.mojom',
+    'mojo/public/interfaces/shell/shell.mojom',
 ], function(console,
             monotonicClock,
             timer,
             connection,
             core,
             gljs,
             threading,
             nativeViewport,
-            service_provider) {
+            shell) {
 
   const VERTEX_SHADER_SOURCE = [
     'uniform mat4 u_mvpMatrix;',
     'attribute vec4 a_position;',
     'void main()',
     '{',
     '   gl_Position = u_mvpMatrix * a_position;',
     '}'
   ].join('\n');
 
@@ skipping 235 matching lines @@
     gl.bindBuffer(gl.ARRAY_BUFFER, 0);
 
     vboIndices = gl.createBuffer();
     gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, vboIndices);
     gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, cubeIndices, gl.STATIC_DRAW);
     gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, 0);
 
     return cubeIndices.length;
   }
 
-  function SampleApp(service_provider) {
-    this.service_provider_ = service_provider;
+  function SampleApp(shell) {
+    this.shell_ = shell;
 
     var pipe = new core.createMessagePipe();
-    this.service_provider_.connect('mojo:mojo_native_viewport_service',
-                                   pipe.handle1);
+    this.shell_.connect('mojo:mojo_native_viewport_service', pipe.handle1);
     new connection.Connection(pipe.handle0, NativeViewportClientImpl,
                               nativeViewport.NativeViewportProxy);
   }
   // TODO(aa): It is a bummer to need this stub object in JavaScript. We should
   // have a 'client' object that contains both the sending and receiving bits of
   // the client side of the interface. Since JS is loosely typed, we do not need
   // a separate base class to inherit from to receive callbacks.
-  SampleApp.prototype =
-      Object.create(service_provider.ServiceProviderStub.prototype);
+  SampleApp.prototype = Object.create(shell.ShellClientStub.prototype);
 
 
   function NativeViewportClientImpl(remote) {
     this.remote_ = remote;
 
     var pipe = core.createMessagePipe();
 
     var rect = new nativeViewport.Rect;
     rect.position = new nativeViewport.Point;
     rect.size = new nativeViewport.Size;
@@ skipping 81 matching lines @@
   GLES2ClientImpl.prototype.getRotationForTimeDelta = function(secondsDelta) {
     return secondsDelta * 40;
   };
 
   GLES2ClientImpl.prototype.contextLost = function() {
     console.log('GLES2ClientImpl.prototype.contextLost');
   };
 
 
   return function(handle) {
-    new connection.Connection(
-        handle, SampleApp, service_provider.ServiceProviderProxy);
+    new connection.Connection(handle, SampleApp, shell.ShellProxy);
   };
 });