Chromium Code Reviews| Index: ios/web/shell/view_controller.mm |
| diff --git a/ios/web/shell/view_controller.mm b/ios/web/shell/view_controller.mm |
| index 98ebd10a3e0da7e746cbbf04b2936a9d5e077e32..0522cbc55556400d83b27ca1195e6001b09de955 100644 |
| --- a/ios/web/shell/view_controller.mm |
| +++ b/ios/web/shell/view_controller.mm |
| @@ -18,6 +18,7 @@ |
| #include "ios/web/public/referrer.h" |
| #import "ios/web/public/web_controller_factory.h" |
| #include "ios/web/public/web_state/web_state.h" |
| +#import "ios/web/public/web_state/web_state_delegate_bridge.h" |
| #import "ios/web/public/web_state/web_state_observer_bridge.h" |
| #include "ios/web/shell/shell_browser_state.h" |
| #include "ios/web/web_state/ui/crw_web_controller.h" |
| @@ -30,10 +31,11 @@ NSString* const kWebShellAddressFieldAccessibilityLabel = @"Address field"; |
| using web::NavigationManager; |
| -@interface ViewController ()<CRWWebStateObserver> { |
| +@interface ViewController ()<CRWWebStateDelegate, CRWWebStateObserver> { |
|
Eugene But (OOO till 7-30)
2016/04/06 21:35:17
This is unused now, but works as example and a bas
|
| web::BrowserState* _browserState; |
| base::scoped_nsobject<CRWWebController> _webController; |
| scoped_ptr<web::WebStateObserverBridge> _webStateObserver; |
| + scoped_ptr<web::WebStateDelegateBridge> _webStateDelegate; |
| base::mac::ObjCPropertyReleaser _propertyReleaser_ViewController; |
| } |
| @@ -117,6 +119,8 @@ using web::NavigationManager; |
| [_webController setWebUsageEnabled:YES]; |
| _webStateObserver.reset(new web::WebStateObserverBridge(self.webState, self)); |
| + _webStateDelegate.reset(new web::WebStateDelegateBridge(self)); |
| + self.webState->SetDelegate(_webStateDelegate.get()); |
| UIView* view = self.webState->GetView(); |
| [view setFrame:[_containerView bounds]]; |