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_array.h" | 7 #include "base/android/jni_array.h" |
8 #include "base/android/jni_string.h" | 8 #include "base/android/jni_string.h" |
9 #include "base/containers/stack_container.h" | 9 #include "base/containers/stack_container.h" |
10 #include "base/i18n/string_compare.h" | 10 #include "base/i18n/string_compare.h" |
11 #include "base/prefs/pref_service.h" | 11 #include "base/prefs/pref_service.h" |
12 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 12 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
13 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h" | |
14 #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h" | 13 #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h" |
15 #include "chrome/browser/profiles/incognito_helpers.h" | 14 #include "chrome/browser/profiles/incognito_helpers.h" |
16 #include "chrome/browser/profiles/profile.h" | 15 #include "chrome/browser/profiles/profile.h" |
17 #include "chrome/browser/profiles/profile_android.h" | 16 #include "chrome/browser/profiles/profile_android.h" |
18 #include "chrome/browser/signin/signin_manager_factory.h" | 17 #include "chrome/browser/signin/signin_manager_factory.h" |
19 #include "chrome/browser/undo/bookmark_undo_service_factory.h" | 18 #include "chrome/browser/undo/bookmark_undo_service_factory.h" |
20 #include "chrome/common/pref_names.h" | 19 #include "chrome/common/pref_names.h" |
21 #include "components/bookmarks/browser/bookmark_match.h" | 20 #include "components/bookmarks/browser/bookmark_match.h" |
22 #include "components/bookmarks/browser/bookmark_model.h" | 21 #include "components/bookmarks/browser/bookmark_model.h" |
23 #include "components/bookmarks/browser/bookmark_utils.h" | 22 #include "components/bookmarks/browser/bookmark_utils.h" |
24 #include "components/bookmarks/browser/scoped_group_bookmark_actions.h" | 23 #include "components/bookmarks/browser/scoped_group_bookmark_actions.h" |
25 #include "components/bookmarks/common/android/bookmark_type.h" | 24 #include "components/bookmarks/common/android/bookmark_type.h" |
26 #include "components/bookmarks/managed/managed_bookmark_service.h" | 25 #include "components/bookmarks/managed/managed_bookmark_service.h" |
| 26 #include "components/enhanced_bookmarks/enhanced_bookmark_features.h" |
27 #include "components/query_parser/query_parser.h" | 27 #include "components/query_parser/query_parser.h" |
28 #include "components/signin/core/browser/signin_manager.h" | 28 #include "components/signin/core/browser/signin_manager.h" |
29 #include "components/undo/bookmark_undo_service.h" | 29 #include "components/undo/bookmark_undo_service.h" |
30 #include "components/undo/undo_manager.h" | 30 #include "components/undo/undo_manager.h" |
31 #include "content/public/browser/browser_thread.h" | 31 #include "content/public/browser/browser_thread.h" |
32 #include "grit/components_strings.h" | 32 #include "grit/components_strings.h" |
33 #include "jni/BookmarksBridge_jni.h" | 33 #include "jni/BookmarksBridge_jni.h" |
34 #include "ui/base/l10n/l10n_util.h" | 34 #include "ui/base/l10n/l10n_util.h" |
35 | 35 |
36 using base::android::AttachCurrentThread; | 36 using base::android::AttachCurrentThread; |
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
135 } | 135 } |
136 | 136 |
137 static jlong Init(JNIEnv* env, jobject obj, jobject j_profile) { | 137 static jlong Init(JNIEnv* env, jobject obj, jobject j_profile) { |
138 BookmarksBridge* delegate = new BookmarksBridge(env, obj, j_profile); | 138 BookmarksBridge* delegate = new BookmarksBridge(env, obj, j_profile); |
139 return reinterpret_cast<intptr_t>(delegate); | 139 return reinterpret_cast<intptr_t>(delegate); |
140 } | 140 } |
141 | 141 |
142 static jboolean IsEnhancedBookmarksFeatureEnabled(JNIEnv* env, | 142 static jboolean IsEnhancedBookmarksFeatureEnabled(JNIEnv* env, |
143 jclass clazz, | 143 jclass clazz, |
144 jobject j_profile) { | 144 jobject j_profile) { |
145 return IsEnhancedBookmarksEnabled(); | 145 return enhanced_bookmarks::IsEnhancedBookmarksEnabled(); |
146 } | 146 } |
147 | 147 |
148 jboolean BookmarksBridge::IsEditBookmarksEnabled(JNIEnv* env, jobject obj) { | 148 jboolean BookmarksBridge::IsEditBookmarksEnabled(JNIEnv* env, jobject obj) { |
149 return IsEditBookmarksEnabled(); | 149 return IsEditBookmarksEnabled(); |
150 } | 150 } |
151 | 151 |
152 void BookmarksBridge::LoadEmptyPartnerBookmarkShimForTesting(JNIEnv* env, | 152 void BookmarksBridge::LoadEmptyPartnerBookmarkShimForTesting(JNIEnv* env, |
153 jobject obj) { | 153 jobject obj) { |
154 if (partner_bookmarks_shim_->IsLoaded()) | 154 if (partner_bookmarks_shim_->IsLoaded()) |
155 return; | 155 return; |
(...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
706 DCHECK(IsLoaded()); | 706 DCHECK(IsLoaded()); |
707 DCHECK(grouped_bookmark_actions_.get()); // should only call after start | 707 DCHECK(grouped_bookmark_actions_.get()); // should only call after start |
708 grouped_bookmark_actions_.reset(); | 708 grouped_bookmark_actions_.reset(); |
709 } | 709 } |
710 | 710 |
711 base::string16 BookmarksBridge::GetTitle(const BookmarkNode* node) const { | 711 base::string16 BookmarksBridge::GetTitle(const BookmarkNode* node) const { |
712 if (partner_bookmarks_shim_->IsPartnerBookmark(node)) | 712 if (partner_bookmarks_shim_->IsPartnerBookmark(node)) |
713 return partner_bookmarks_shim_->GetTitle(node); | 713 return partner_bookmarks_shim_->GetTitle(node); |
714 | 714 |
715 if (node == bookmark_model_->bookmark_bar_node() | 715 if (node == bookmark_model_->bookmark_bar_node() |
716 && IsEnhancedBookmarksEnabled()) { | 716 && enhanced_bookmarks::IsEnhancedBookmarksEnabled()) { |
717 return l10n_util::GetStringUTF16(IDS_ENHANCED_BOOKMARK_BAR_FOLDER_NAME); | 717 return l10n_util::GetStringUTF16(IDS_ENHANCED_BOOKMARK_BAR_FOLDER_NAME); |
718 } | 718 } |
719 | 719 |
720 return node->GetTitle(); | 720 return node->GetTitle(); |
721 } | 721 } |
722 | 722 |
723 ScopedJavaLocalRef<jobject> BookmarksBridge::CreateJavaBookmark( | 723 ScopedJavaLocalRef<jobject> BookmarksBridge::CreateJavaBookmark( |
724 const BookmarkNode* node) { | 724 const BookmarkNode* node) { |
725 JNIEnv* env = AttachCurrentThread(); | 725 JNIEnv* env = AttachCurrentThread(); |
726 | 726 |
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1015 BookmarkModelChanged(); | 1015 BookmarkModelChanged(); |
1016 } | 1016 } |
1017 | 1017 |
1018 void BookmarksBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) { | 1018 void BookmarksBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) { |
1019 NotifyIfDoneLoading(); | 1019 NotifyIfDoneLoading(); |
1020 } | 1020 } |
1021 | 1021 |
1022 void BookmarksBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) { | 1022 void BookmarksBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) { |
1023 partner_bookmarks_shim_ = NULL; | 1023 partner_bookmarks_shim_ = NULL; |
1024 } | 1024 } |
OLD | NEW |