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/web_state/ui/crw_ui_web_view_web_controller.h" | 5 #import "ios/web/web_state/ui/crw_ui_web_view_web_controller.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
| 10 #include <utility> |
| 11 |
10 #import "base/ios/ios_util.h" | 12 #import "base/ios/ios_util.h" |
11 #import "base/ios/ns_error_util.h" | 13 #import "base/ios/ns_error_util.h" |
12 #import "base/ios/weak_nsobject.h" | 14 #import "base/ios/weak_nsobject.h" |
13 #include "base/json/json_reader.h" | 15 #include "base/json/json_reader.h" |
14 #include "base/json/string_escape.h" | 16 #include "base/json/string_escape.h" |
15 #include "base/mac/bind_objc_block.h" | 17 #include "base/mac/bind_objc_block.h" |
16 #import "base/mac/scoped_nsobject.h" | 18 #import "base/mac/scoped_nsobject.h" |
17 #include "base/macros.h" | 19 #include "base/macros.h" |
18 #include "base/memory/scoped_ptr.h" | 20 #include "base/memory/scoped_ptr.h" |
19 #include "base/metrics/field_trial.h" | 21 #include "base/metrics/field_trial.h" |
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
321 // The maximum size of JSON message passed from JavaScript to ObjC. | 323 // The maximum size of JSON message passed from JavaScript to ObjC. |
322 // 256kB is an arbitrary number that was chosen to be a magnitude larger than | 324 // 256kB is an arbitrary number that was chosen to be a magnitude larger than |
323 // any legitimate message. | 325 // any legitimate message. |
324 const size_t kMaxMessageQueueSize = 262144; | 326 const size_t kMaxMessageQueueSize = 262144; |
325 | 327 |
326 } // namespace | 328 } // namespace |
327 | 329 |
328 @implementation CRWUIWebViewWebController | 330 @implementation CRWUIWebViewWebController |
329 | 331 |
330 - (instancetype)initWithWebState:(scoped_ptr<web::WebStateImpl>)webState { | 332 - (instancetype)initWithWebState:(scoped_ptr<web::WebStateImpl>)webState { |
331 self = [super initWithWebState:webState.Pass()]; | 333 self = [super initWithWebState:std::move(webState)]; |
332 if (self) { | 334 if (self) { |
333 _jsInvokeParameterQueue.reset([[CRWJSInvokeParameterQueue alloc] init]); | 335 _jsInvokeParameterQueue.reset([[CRWJSInvokeParameterQueue alloc] init]); |
334 | 336 |
335 NSNotificationCenter* defaultCenter = [NSNotificationCenter defaultCenter]; | 337 NSNotificationCenter* defaultCenter = [NSNotificationCenter defaultCenter]; |
336 [defaultCenter addObserver:self | 338 [defaultCenter addObserver:self |
337 selector:@selector(moviePlayerDidEnterFullscreen:) | 339 selector:@selector(moviePlayerDidEnterFullscreen:) |
338 name: | 340 name: |
339 @"UIMoviePlayerControllerDidEnterFullscreenNotification" | 341 @"UIMoviePlayerControllerDidEnterFullscreenNotification" |
340 object:nil]; | 342 object:nil]; |
341 [defaultCenter addObserver:self | 343 [defaultCenter addObserver:self |
(...skipping 1251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1593 } | 1595 } |
1594 | 1596 |
1595 #pragma mark - | 1597 #pragma mark - |
1596 #pragma mark Testing methods | 1598 #pragma mark Testing methods |
1597 | 1599 |
1598 -(id<CRWRecurringTaskDelegate>)recurringTaskDelegate { | 1600 -(id<CRWRecurringTaskDelegate>)recurringTaskDelegate { |
1599 return _recurringTaskDelegate; | 1601 return _recurringTaskDelegate; |
1600 } | 1602 } |
1601 | 1603 |
1602 @end | 1604 @end |
OLD | NEW |