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/bookmarks_bridge.h" | 5 #include "chrome/browser/android/bookmarks/bookmarks_bridge.h" |
6 | 6 |
7 #include "base/android/jni_string.h" | 7 #include "base/android/jni_string.h" |
8 #include "base/containers/stack_container.h" | 8 #include "base/containers/stack_container.h" |
9 #include "base/i18n/string_compare.h" | 9 #include "base/i18n/string_compare.h" |
10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
11 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 11 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
12 #include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h" | 12 #include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h" |
13 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h" | 13 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h" |
14 #include "chrome/browser/profiles/incognito_helpers.h" | 14 #include "chrome/browser/profiles/incognito_helpers.h" |
15 #include "chrome/browser/profiles/profile.h" | 15 #include "chrome/browser/profiles/profile.h" |
16 #include "chrome/browser/profiles/profile_android.h" | 16 #include "chrome/browser/profiles/profile_android.h" |
17 #include "chrome/browser/profiles/profile_manager.h" | 17 #include "chrome/browser/profiles/profile_manager.h" |
18 #include "chrome/browser/signin/signin_manager_factory.h" | 18 #include "chrome/browser/signin/signin_manager_factory.h" |
19 #include "chrome/browser/undo/bookmark_undo_service.h" | 19 #include "chrome/browser/undo/bookmark_undo_service.h" |
20 #include "chrome/browser/undo/bookmark_undo_service_factory.h" | 20 #include "chrome/browser/undo/bookmark_undo_service_factory.h" |
21 #include "chrome/browser/undo/undo_manager.h" | 21 #include "chrome/browser/undo/undo_manager.h" |
22 #include "chrome/common/pref_names.h" | 22 #include "chrome/common/pref_names.h" |
23 #include "components/bookmarks/browser/bookmark_match.h" | 23 #include "components/bookmarks/browser/bookmark_match.h" |
24 #include "components/bookmarks/browser/bookmark_model.h" | 24 #include "components/bookmarks/browser/bookmark_model.h" |
25 #include "components/bookmarks/browser/bookmark_utils.h" | 25 #include "components/bookmarks/browser/bookmark_utils.h" |
26 #include "components/bookmarks/browser/scoped_group_bookmark_actions.h" | 26 #include "components/bookmarks/browser/scoped_group_bookmark_actions.h" |
27 #include "components/bookmarks/common/android/bookmark_type.h" | 27 #include "components/bookmarks/common/android/bookmark_type.h" |
| 28 #include "components/query_parser/query_parser.h" |
28 #include "components/signin/core/browser/signin_manager.h" | 29 #include "components/signin/core/browser/signin_manager.h" |
29 #include "content/public/browser/browser_thread.h" | 30 #include "content/public/browser/browser_thread.h" |
30 #include "jni/BookmarksBridge_jni.h" | 31 #include "jni/BookmarksBridge_jni.h" |
31 | 32 |
32 using base::android::AttachCurrentThread; | 33 using base::android::AttachCurrentThread; |
33 using base::android::ConvertUTF8ToJavaString; | 34 using base::android::ConvertUTF8ToJavaString; |
34 using base::android::ConvertUTF16ToJavaString; | 35 using base::android::ConvertUTF16ToJavaString; |
35 using base::android::ScopedJavaLocalRef; | 36 using base::android::ScopedJavaLocalRef; |
36 using base::android::ScopedJavaGlobalRef; | 37 using base::android::ScopedJavaGlobalRef; |
37 using bookmarks::android::JavaBookmarkIdCreateBookmarkId; | 38 using bookmarks::android::JavaBookmarkIdCreateBookmarkId; |
(...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
658 jobject obj, | 659 jobject obj, |
659 jobject j_list, | 660 jobject j_list, |
660 jstring j_query, | 661 jstring j_query, |
661 jint max_results) { | 662 jint max_results) { |
662 DCHECK(bookmark_model_->loaded()); | 663 DCHECK(bookmark_model_->loaded()); |
663 | 664 |
664 std::vector<bookmarks::BookmarkMatch> results; | 665 std::vector<bookmarks::BookmarkMatch> results; |
665 bookmark_model_->GetBookmarksMatching( | 666 bookmark_model_->GetBookmarksMatching( |
666 base::android::ConvertJavaStringToUTF16(env, j_query), | 667 base::android::ConvertJavaStringToUTF16(env, j_query), |
667 max_results, | 668 max_results, |
| 669 query_parser::MatchingAlgorithm::ALWAYS_PREFIX_SEARCH, |
668 &results); | 670 &results); |
669 for (const bookmarks::BookmarkMatch& match : results) { | 671 for (const bookmarks::BookmarkMatch& match : results) { |
670 const BookmarkNode* node = match.node; | 672 const BookmarkNode* node = match.node; |
671 Java_BookmarksBridge_addToBookmarkIdList( | 673 Java_BookmarksBridge_addToBookmarkIdList( |
672 env, j_list, node->id(), node->type()); | 674 env, j_list, node->id(), node->type()); |
673 } | 675 } |
674 } | 676 } |
675 | 677 |
676 ScopedJavaLocalRef<jobject> BookmarksBridge::AddBookmark( | 678 ScopedJavaLocalRef<jobject> BookmarksBridge::AddBookmark( |
677 JNIEnv* env, | 679 JNIEnv* env, |
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1002 BookmarkModelChanged(); | 1004 BookmarkModelChanged(); |
1003 } | 1005 } |
1004 | 1006 |
1005 void BookmarksBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) { | 1007 void BookmarksBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) { |
1006 NotifyIfDoneLoading(); | 1008 NotifyIfDoneLoading(); |
1007 } | 1009 } |
1008 | 1010 |
1009 void BookmarksBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) { | 1011 void BookmarksBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) { |
1010 partner_bookmarks_shim_ = NULL; | 1012 partner_bookmarks_shim_ = NULL; |
1011 } | 1013 } |
OLD | NEW |