OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #import "sky_view_controller.h" | 5 #import "sky_view_controller.h" |
6 #import "sky_surface.h" | 6 #import "sky_surface.h" |
7 | 7 |
8 #import <UIKit/UIKit.h> | 8 #import <UIKit/UIKit.h> |
9 #import <QuartzCore/QuartzCore.h> | 9 #import <QuartzCore/QuartzCore.h> |
10 | 10 |
| 11 #include "sky/shell/shell_view.h" |
| 12 |
11 @implementation SkyViewController | 13 @implementation SkyViewController |
12 | 14 |
13 - (void)loadView { | 15 - (void)loadView { |
14 SkySurface* surface = [[SkySurface alloc] init]; | 16 |
| 17 ShellView* shell_view = new sky::shell::ShellView(sky::shell::Shell::Shared())
; |
| 18 SkySurface* surface = [[SkySurface alloc] initWithShellView: shell_view]; |
15 | 19 |
16 surface.autoresizingMask = | 20 surface.autoresizingMask = |
17 UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; | 21 UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; |
18 | 22 |
19 self.view = surface; | 23 self.view = surface; |
20 | 24 |
21 [surface release]; | 25 [surface release]; |
22 } | 26 } |
23 | 27 |
24 @end | 28 @end |
OLD | NEW |