OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "chrome/browser/android/bookmarks/bookmark_bridge.h" | 5 #include "chrome/browser/android/bookmarks/bookmark_bridge.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include "base/android/jni_array.h" | 10 #include "base/android/jni_array.h" |
(...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
588 | 588 |
589 std::vector<bookmarks::TitledUrlMatch> results; | 589 std::vector<bookmarks::TitledUrlMatch> results; |
590 bookmark_model_->GetBookmarksMatching( | 590 bookmark_model_->GetBookmarksMatching( |
591 base::android::ConvertJavaStringToUTF16(env, j_query), | 591 base::android::ConvertJavaStringToUTF16(env, j_query), |
592 max_results, | 592 max_results, |
593 query_parser::MatchingAlgorithm::ALWAYS_PREFIX_SEARCH, | 593 query_parser::MatchingAlgorithm::ALWAYS_PREFIX_SEARCH, |
594 &results); | 594 &results); |
595 for (const bookmarks::TitledUrlMatch& match : results) { | 595 for (const bookmarks::TitledUrlMatch& match : results) { |
596 const BookmarkNode* node = static_cast<const BookmarkNode*>(match.node); | 596 const BookmarkNode* node = static_cast<const BookmarkNode*>(match.node); |
597 | 597 |
598 std::vector<int> title_match_start_positions; | 598 Java_BookmarkBridge_addToBookmarkIdList(env, j_list, node->id(), |
599 std::vector<int> title_match_end_positions; | 599 node->type()); |
600 for (auto position : match.title_match_positions) { | |
601 title_match_start_positions.push_back(position.first); | |
602 title_match_end_positions.push_back(position.second); | |
603 } | |
604 | |
605 std::vector<int> url_match_start_positions; | |
606 std::vector<int> url_match_end_positions; | |
607 for (auto position : match.url_match_positions) { | |
608 url_match_start_positions.push_back(position.first); | |
609 url_match_end_positions.push_back(position.second); | |
610 } | |
611 | |
612 Java_BookmarkBridge_addToBookmarkMatchList( | |
613 env, j_list, node->id(), node->type(), | |
614 ToJavaIntArray(env, title_match_start_positions), | |
615 ToJavaIntArray(env, title_match_end_positions), | |
616 ToJavaIntArray(env, url_match_start_positions), | |
617 ToJavaIntArray(env, url_match_end_positions)); | |
618 } | 600 } |
619 } | 601 } |
620 | 602 |
621 ScopedJavaLocalRef<jobject> BookmarkBridge::AddFolder( | 603 ScopedJavaLocalRef<jobject> BookmarkBridge::AddFolder( |
622 JNIEnv* env, | 604 JNIEnv* env, |
623 const JavaParamRef<jobject>& obj, | 605 const JavaParamRef<jobject>& obj, |
624 const JavaParamRef<jobject>& j_parent_id_obj, | 606 const JavaParamRef<jobject>& j_parent_id_obj, |
625 jint index, | 607 jint index, |
626 const JavaParamRef<jstring>& j_title) { | 608 const JavaParamRef<jstring>& j_title) { |
627 DCHECK(IsLoaded()); | 609 DCHECK(IsLoaded()); |
(...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1031 BookmarkModelChanged(); | 1013 BookmarkModelChanged(); |
1032 } | 1014 } |
1033 | 1015 |
1034 void BookmarkBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) { | 1016 void BookmarkBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) { |
1035 NotifyIfDoneLoading(); | 1017 NotifyIfDoneLoading(); |
1036 } | 1018 } |
1037 | 1019 |
1038 void BookmarkBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) { | 1020 void BookmarkBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) { |
1039 partner_bookmarks_shim_ = NULL; | 1021 partner_bookmarks_shim_ = NULL; |
1040 } | 1022 } |
OLD | NEW |