OLD | NEW |
---|---|
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 #include "ios/chrome/app/application_delegate/mock_tab_opener.h" | 5 #include "ios/chrome/app/application_delegate/mock_tab_opener.h" |
6 | 6 |
7 #include "base/ios/block_types.h" | 7 #include "base/ios/block_types.h" |
8 #include "base/mac/scoped_block.h" | 8 #include "base/mac/scoped_block.h" |
9 #include "ios/chrome/app/application_mode.h" | 9 #include "ios/chrome/app/application_mode.h" |
10 #include "ui/base/page_transition_types.h" | 10 #include "ui/base/page_transition_types.h" |
11 #include "url/gurl.h" | 11 #include "url/gurl.h" |
12 | 12 |
13 #if !defined(__has_feature) || !__has_feature(objc_arc) | |
14 #error "This file requires ARC support." | |
15 #endif | |
16 | |
13 @interface MockTabOpener () { | 17 @interface MockTabOpener () { |
14 base::mac::ScopedBlock<ProceduralBlock> _completionBlock; | 18 ProceduralBlock _completionBlock; |
sdefresne
2017/02/21 09:42:40
I think you can @synthesize this property now.
stkhapugin
2017/02/21 12:53:02
Done.
| |
15 } | 19 } |
16 | 20 |
17 @end | 21 @end |
18 | 22 |
19 @implementation MockTabOpener | 23 @implementation MockTabOpener |
20 | 24 |
21 @synthesize url = _url; | 25 @synthesize url = _url; |
22 @synthesize applicationMode = _applicationMode; | 26 @synthesize applicationMode = _applicationMode; |
23 | 27 |
24 - (void)dismissModalsAndOpenSelectedTabInMode:(ApplicationMode)targetMode | 28 - (void)dismissModalsAndOpenSelectedTabInMode:(ApplicationMode)targetMode |
25 withURL:(const GURL&)url | 29 withURL:(const GURL&)url |
26 transition:(ui::PageTransition)transition | 30 transition:(ui::PageTransition)transition |
27 completion:(ProceduralBlock)handler { | 31 completion:(ProceduralBlock)handler { |
28 _url = url; | 32 _url = url; |
29 _applicationMode = targetMode; | 33 _applicationMode = targetMode; |
30 _completionBlock.reset([handler copy]); | 34 _completionBlock = [handler copy]; |
31 } | 35 } |
32 | 36 |
33 - (void)resetURL { | 37 - (void)resetURL { |
34 _url = _url.EmptyGURL(); | 38 _url = _url.EmptyGURL(); |
35 } | 39 } |
36 | 40 |
37 - (void (^)())completionBlock { | 41 - (void (^)())completionBlock { |
sdefresne
2017/02/21 09:42:40
Remove if you use @synthesize.
stkhapugin
2017/02/21 12:53:02
Done.
| |
38 return _completionBlock; | 42 return _completionBlock; |
39 } | 43 } |
40 | 44 |
41 - (void)openTabFromLaunchOptions:(NSDictionary*)launchOptions | 45 - (void)openTabFromLaunchOptions:(NSDictionary*)launchOptions |
42 startupInformation:(id<StartupInformation>)startupInformation | 46 startupInformation:(id<StartupInformation>)startupInformation |
43 appState:(AppState*)appState { | 47 appState:(AppState*)appState { |
44 // Stub. | 48 // Stub. |
45 } | 49 } |
46 | 50 |
47 - (BOOL)shouldOpenNTPTabOnActivationOfTabModel:(TabModel*)tabModel { | 51 - (BOOL)shouldOpenNTPTabOnActivationOfTabModel:(TabModel*)tabModel { |
48 // Stub. | 52 // Stub. |
49 return YES; | 53 return YES; |
50 } | 54 } |
51 | 55 |
52 @end | 56 @end |
OLD | NEW |