| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "ios/web/shell/app_delegate.h" | 5 #import "ios/web/shell/app_delegate.h" |
| 6 | 6 |
| 7 #include <memory> |
| 8 |
| 7 #import "base/mac/scoped_nsobject.h" | 9 #import "base/mac/scoped_nsobject.h" |
| 8 #include "base/memory/scoped_ptr.h" | |
| 9 #include "ios/web/public/app/web_main.h" | 10 #include "ios/web/public/app/web_main.h" |
| 10 #include "ios/web/public/web_client.h" | 11 #include "ios/web/public/web_client.h" |
| 11 #include "ios/web/public/web_state/web_state.h" | 12 #include "ios/web/public/web_state/web_state.h" |
| 12 #include "ios/web/shell/shell_browser_state.h" | 13 #include "ios/web/shell/shell_browser_state.h" |
| 13 #include "ios/web/shell/shell_main_delegate.h" | 14 #include "ios/web/shell/shell_main_delegate.h" |
| 14 #include "ios/web/shell/shell_web_client.h" | 15 #include "ios/web/shell/shell_web_client.h" |
| 15 #import "ios/web/shell/view_controller.h" | 16 #import "ios/web/shell/view_controller.h" |
| 16 | 17 |
| 17 @interface AppDelegate () { | 18 @interface AppDelegate () { |
| 18 scoped_ptr<web::ShellMainDelegate> _delegate; | 19 std::unique_ptr<web::ShellMainDelegate> _delegate; |
| 19 scoped_ptr<web::WebMain> _webMain; | 20 std::unique_ptr<web::WebMain> _webMain; |
| 20 } | 21 } |
| 21 @end | 22 @end |
| 22 | 23 |
| 23 @implementation AppDelegate | 24 @implementation AppDelegate |
| 24 | 25 |
| 25 @synthesize window = _window; | 26 @synthesize window = _window; |
| 26 | 27 |
| 27 - (BOOL)application:(UIApplication*)application | 28 - (BOOL)application:(UIApplication*)application |
| 28 didFinishLaunchingWithOptions:(NSDictionary*)launchOptions { | 29 didFinishLaunchingWithOptions:(NSDictionary*)launchOptions { |
| 29 _window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]; | 30 _window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]; |
| (...skipping 25 matching lines...) Expand all Loading... |
| 55 | 56 |
| 56 - (void)applicationDidBecomeActive:(UIApplication*)application { | 57 - (void)applicationDidBecomeActive:(UIApplication*)application { |
| 57 } | 58 } |
| 58 | 59 |
| 59 - (void)applicationWillTerminate:(UIApplication*)application { | 60 - (void)applicationWillTerminate:(UIApplication*)application { |
| 60 _webMain.reset(); | 61 _webMain.reset(); |
| 61 _delegate.reset(); | 62 _delegate.reset(); |
| 62 } | 63 } |
| 63 | 64 |
| 64 @end | 65 @end |
| OLD | NEW |