Refactor SkyShell to allow multiple SkyViews

sky/shell/ios/sky_surface.mm

 // Copyright 2015 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.
 
 #import "sky_surface.h"
 
 #import <QuartzCore/QuartzCore.h>
 #import <OpenGLES/EAGL.h>
 #import <OpenGLES/EAGLDrawable.h>
 
+#include "sky/shell/ios/platform_view_ios.h"
+#include "sky/shell/shell.h"
+#include "sky/shell/shell_view.h"
 #include "sky/shell/ui_delegate.h"
-#include "sky/shell/shell.h"
-#include "sky/shell/ios/platform_view_ios.h"
 
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "sky/services/viewport/input_event.mojom.h"
 #include "base/time/time.h"
 
 static inline sky::EventType EventTypeFromUITouchPhase(UITouchPhase phase) {
   switch (phase) {
     case UITouchPhaseBegan:
       return sky::EVENT_TYPE_POINTER_DOWN;
     case UITouchPhaseMoved:
     case UITouchPhaseStationary:
       // There is no EVENT_TYPE_POINTER_STATIONARY. So we just pass a move type
       // with the same coordinates
       return sky::EVENT_TYPE_POINTER_MOVE;
     case UITouchPhaseEnded:
       return sky::EVENT_TYPE_POINTER_UP;
     case UITouchPhaseCancelled:
       return sky::EVENT_TYPE_POINTER_CANCEL;
   }
 
   return sky::EVENT_TYPE_UNKNOWN;
 }
 
 @implementation SkySurface {
   BOOL _platformViewInitialized;
 
   sky::ViewportObserverPtr _viewport_observer;
+  scoped_ptr<sky::shell::ShellView> _shell_view;
+}
+
+-(instancetype) initWithShellView:(sky::shell::ShellView *) shellView {
+  self = [super init];
+  if (self)
+    _shell_view.reset(shellView);
+  return self;
 }
 
 - (gfx::AcceleratedWidget)acceleratedWidget {
   return (gfx::AcceleratedWidget)self.layer;
 }
 
 - (void)layoutSubviews {
   [super layoutSubviews];
 
   [self configureLayerDefaults];
@@ skipping 22 matching lines @@
     return;
   }
 
   _platformViewInitialized = YES;
 
   [self notifySurfaceCreation];
   [self connectToViewportObserverAndLoad];
 }
 
 - (sky::shell::PlatformViewIOS*)platformView {
-  auto view = static_cast<sky::shell::PlatformViewIOS*>(
-      sky::shell::Shell::Shared().view());
+  auto view = static_cast<sky::shell::PlatformViewIOS*>(_shell_view->view());
   DCHECK(view);
   return view;
 }
 
 - (void)notifySurfaceCreation {
   self.platformView->SurfaceCreated(self.acceleratedWidget);
 }
 
 - (NSString*)skyInitialLoadURL {
   return [NSBundle mainBundle].infoDictionary[@"com.google.sky.load_url"];
 }
 
 - (void)connectToViewportObserverAndLoad {
-  auto view = sky::shell::Shell::Shared().view();
+  auto view = static_cast<sky::shell::PlatformViewIOS*>(_shell_view->view());
   auto interface_request = mojo::GetProxy(&_viewport_observer);
   view->ConnectToViewportObserver(interface_request.Pass());
 
   mojo::String string(self.skyInitialLoadURL.UTF8String);
   _viewport_observer->LoadURL(string);
 }
 
 - (void)notifySurfaceDestruction {
   self.platformView->SurfaceDestroyed();
 }
@@ skipping 44 matching lines @@
 + (Class)layerClass {
   return [CAEAGLLayer class];
 }
 
 - (void)dealloc {
   [self notifySurfaceDestruction];
   [super dealloc];
 }
 
 @end