Chromium Code Reviews| 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 #import <string> | |
| 6 | |
| 5 #import <EarlGrey/EarlGrey.h> | 7 #import <EarlGrey/EarlGrey.h> |
| 6 | 8 |
| 7 #import "ios/web/public/web_state/web_state.h" | 9 #import "ios/web/public/web_state/web_state.h" |
| 8 | 10 |
| 9 namespace web { | 11 namespace web { |
| 10 | 12 |
| 13 // TODO(crbug.com/614167): Remove this method when it is no longer used. | |
| 11 // Shorthand for GREYMatchers::matcherForWebViewContainingText:inWebState. | 14 // Shorthand for GREYMatchers::matcherForWebViewContainingText:inWebState. |
| 12 id<GREYMatcher> webViewContainingText(NSString* text, web::WebState* webState); | 15 id<GREYMatcher> webViewContainingText(NSString* text, web::WebState* webState); |
| 13 | 16 |
| 17 // Shorthand for GREYMatchers::matcherForWebViewContainingText:inWebState. | |
| 18 id<GREYMatcher> webViewContainingText(const std::string& text, | |
| 19 web::WebState* webState); | |
| 20 | |
| 14 } // namespace web | 21 } // namespace web |
| 15 | 22 |
| 16 @interface GREYMatchers (WebViewAdditions) | 23 @interface GREYMatchers (WebViewAdditions) |
| 17 | 24 |
| 18 // Matcher for WKWebView containing |text|. | 25 // Matcher for WKWebView containing |text|. |
| 19 + (id<GREYMatcher>)matcherForWebViewContainingText:(NSString*)text | 26 + (id<GREYMatcher>)matcherForWebViewContainingText:(std::string)text |
|
Eugene But (OOO till 7-30)
2016/05/24 01:20:31
const std::string &
baxley
2016/05/24 13:12:00
Done.
| |
| 20 inWebState:(web::WebState*)webState; | 27 inWebState:(web::WebState*)webState; |
| 21 | 28 |
| 22 @end | 29 @end |
| OLD | NEW |