diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-19 21:04:11 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-19 21:04:11 +0000 |
| commit | ba2bd157297d9e5fac3f781ab9951736e9e29eb8 (patch) | |
| tree | 6ffc8322c5fb83d7dcd620bb14f860bb1568797a /webkit/glue/webframe_impl.cc | |
| parent | 1fff4a0530c3ef7d2ea5a8af727100ec04a0e3e9 (diff) | |
| download | chromium_src-ba2bd157297d9e5fac3f781ab9951736e9e29eb8.zip chromium_src-ba2bd157297d9e5fac3f781ab9951736e9e29eb8.tar.gz chromium_src-ba2bd157297d9e5fac3f781ab9951736e9e29eb8.tar.bz2 | |
Convert FindInPage wstrings to string16.
Review URL: http://codereview.chromium.org/42408
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12158 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webframe_impl.cc')
| -rw-r--r-- | webkit/glue/webframe_impl.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc index c6f8c4c..49a6a08 100644 --- a/webkit/glue/webframe_impl.cc +++ b/webkit/glue/webframe_impl.cc @@ -926,7 +926,7 @@ bool WebFrameImpl::Find(const FindInPageRequest& request, bool wrap_within_frame, gfx::Rect* selection_rect) { WebCore::String webcore_string = - webkit_glue::StdWStringToString(request.search_string); + webkit_glue::String16ToString(request.search_string); WebFrameImpl* const main_frame_impl = static_cast<WebFrameImpl*>(GetView()->GetMainFrame()); @@ -1045,9 +1045,9 @@ bool WebFrameImpl::ShouldScopeMatches(FindInPageRequest request) { // time it was searched, then we don't have to search it again if the user is // just adding to the search string or sending the same search string again. if (scoping_complete_ && - last_search_string_ != std::wstring(L"") && last_match_count_ == 0) { + !last_search_string_.empty() && last_match_count_ == 0) { // Check to see if the search string prefixes match. - std::wstring previous_search_prefix = + string16 previous_search_prefix = request.search_string.substr(0, last_search_string_.length()); if (previous_search_prefix == last_search_string_) { @@ -1142,7 +1142,7 @@ void WebFrameImpl::ScopeStringMatches(FindInPageRequest request, } WebCore::String webcore_string = - webkit_glue::StdWStringToString(request.search_string); + webkit_glue::String16ToString(request.search_string); RefPtr<Range> search_range(rangeOfContents(frame()->document())); |