Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(15)

Side by Side Diff: chrome/browser/android/bookmarks/bookmarks_bridge.cc

Issue 516323003: [Android] JNI bridges for querying top level bookmark folders. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: factory to a function Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/android/bookmarks/bookmarks_bridge.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
10 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 11 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
11 #include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h" 12 #include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h"
12 #include "chrome/browser/profiles/incognito_helpers.h" 13 #include "chrome/browser/profiles/incognito_helpers.h"
13 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/profiles/profile_android.h" 15 #include "chrome/browser/profiles/profile_android.h"
15 #include "chrome/browser/profiles/profile_manager.h" 16 #include "chrome/browser/profiles/profile_manager.h"
16 #include "chrome/browser/signin/signin_manager_factory.h" 17 #include "chrome/browser/signin/signin_manager_factory.h"
17 #include "chrome/common/pref_names.h" 18 #include "chrome/common/pref_names.h"
18 #include "components/bookmarks/browser/bookmark_model.h" 19 #include "components/bookmarks/browser/bookmark_model.h"
(...skipping 14 matching lines...) Expand all
33 using content::BrowserThread; 34 using content::BrowserThread;
34 35
35 namespace { 36 namespace {
36 37
37 class BookmarkNodeCreationTimeCompareFunctor { 38 class BookmarkNodeCreationTimeCompareFunctor {
38 public: 39 public:
39 bool operator()(const BookmarkNode* lhs, const BookmarkNode* rhs) { 40 bool operator()(const BookmarkNode* lhs, const BookmarkNode* rhs) {
40 return lhs->date_added().ToJavaTime() > rhs->date_added().ToJavaTime(); 41 return lhs->date_added().ToJavaTime() > rhs->date_added().ToJavaTime();
41 } 42 }
42 }; 43 };
44
45 class BookmarkTitleComparer {
46 public:
47 explicit BookmarkTitleComparer(const icu::Collator* collator)
48 : collator_(collator) {}
49
50 bool operator()(const BookmarkNode* lhs, const BookmarkNode* rhs) {
51 if (collator_) {
52 return base::i18n::CompareString16WithCollator(
53 collator_, lhs->GetTitle(), rhs->GetTitle()) == UCOL_LESS;
54 } else {
55 return lhs->GetTitle() < rhs->GetTitle();
56 }
57 }
58
59 private:
60 const icu::Collator* collator_;
61 };
62
63 scoped_ptr<icu::Collator> GetICUCollator() {
64 UErrorCode error = U_ZERO_ERROR;
65 scoped_ptr<icu::Collator> collator_;
66 collator_.reset(icu::Collator::createInstance(error));
67 if (U_FAILURE(error))
68 collator_.reset(NULL);
69
70 return collator_.Pass();
71 }
72
43 } // namespace 73 } // namespace
44 74
45 BookmarksBridge::BookmarksBridge(JNIEnv* env, 75 BookmarksBridge::BookmarksBridge(JNIEnv* env,
46 jobject obj, 76 jobject obj,
47 jobject j_profile) 77 jobject j_profile)
48 : weak_java_ref_(env, obj), 78 : weak_java_ref_(env, obj),
49 bookmark_model_(NULL), 79 bookmark_model_(NULL),
50 client_(NULL), 80 client_(NULL),
51 partner_bookmarks_shim_(NULL) { 81 partner_bookmarks_shim_(NULL) {
52 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 82 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 jobject obj, 142 jobject obj,
113 jlong id, 143 jlong id,
114 jint type) { 144 jint type) {
115 DCHECK(IsLoaded()); 145 DCHECK(IsLoaded());
116 return CreateJavaBookmark(GetNodeByID(id, type)); 146 return CreateJavaBookmark(GetNodeByID(id, type));
117 } 147 }
118 148
119 void BookmarksBridge::GetPermanentNodeIDs(JNIEnv* env, 149 void BookmarksBridge::GetPermanentNodeIDs(JNIEnv* env,
120 jobject obj, 150 jobject obj,
121 jobject j_result_obj) { 151 jobject j_result_obj) {
152 // TODO(kkimlabs): Remove this function.
122 DCHECK(IsLoaded()); 153 DCHECK(IsLoaded());
123 154
124 base::StackVector<const BookmarkNode*, 8> permanent_nodes; 155 base::StackVector<const BookmarkNode*, 8> permanent_nodes;
125 156
126 // Save all the permanent nodes. 157 // Save all the permanent nodes.
127 const BookmarkNode* root_node = bookmark_model_->root_node(); 158 const BookmarkNode* root_node = bookmark_model_->root_node();
128 permanent_nodes->push_back(root_node); 159 permanent_nodes->push_back(root_node);
129 for (int i = 0; i < root_node->child_count(); ++i) { 160 for (int i = 0; i < root_node->child_count(); ++i) {
130 permanent_nodes->push_back(root_node->GetChild(i)); 161 permanent_nodes->push_back(root_node->GetChild(i));
131 } 162 }
132 permanent_nodes->push_back( 163 permanent_nodes->push_back(
133 partner_bookmarks_shim_->GetPartnerBookmarksRoot()); 164 partner_bookmarks_shim_->GetPartnerBookmarksRoot());
134 165
135 // Write the permanent nodes to |j_result_obj|. 166 // Write the permanent nodes to |j_result_obj|.
136 for (base::StackVector<const BookmarkNode*, 8>::ContainerType::const_iterator 167 for (base::StackVector<const BookmarkNode*, 8>::ContainerType::const_iterator
137 it = permanent_nodes->begin(); 168 it = permanent_nodes->begin();
138 it != permanent_nodes->end(); 169 it != permanent_nodes->end();
139 ++it) { 170 ++it) {
140 if (*it != NULL) { 171 if (*it != NULL) {
141 Java_BookmarksBridge_addToBookmarkIdList( 172 Java_BookmarksBridge_addToBookmarkIdList(
142 env, j_result_obj, (*it)->id(), GetBookmarkType(*it)); 173 env, j_result_obj, (*it)->id(), GetBookmarkType(*it));
143 } 174 }
144 } 175 }
145 } 176 }
146 177
178 void BookmarksBridge::GetTopLevelFolderParentIDs(JNIEnv* env,
179 jobject obj,
180 jobject j_result_obj) {
181 Java_BookmarksBridge_addToBookmarkIdList(
182 env, j_result_obj, bookmark_model_->root_node()->id(),
183 GetBookmarkType(bookmark_model_->root_node()));
184 Java_BookmarksBridge_addToBookmarkIdList(
185 env, j_result_obj, bookmark_model_->mobile_node()->id(),
186 GetBookmarkType(bookmark_model_->mobile_node()));
187 Java_BookmarksBridge_addToBookmarkIdList(
188 env, j_result_obj, bookmark_model_->other_node()->id(),
189 GetBookmarkType(bookmark_model_->other_node()));
190 }
191
192 void BookmarksBridge::GetTopLevelFolderIDs(JNIEnv* env,
193 jobject obj,
194 jboolean get_special,
195 jboolean get_normal,
196 jobject j_result_obj) {
197 DCHECK(IsLoaded());
198 std::vector<const BookmarkNode*> top_level_folders;
199
200 if (get_special) {
201 if (client_->managed_node() &&
202 client_->managed_node()->child_count() > 0) {
203 top_level_folders.push_back(client_->managed_node());
204 }
205 if (partner_bookmarks_shim_->HasPartnerBookmarks()) {
206 top_level_folders.push_back(
207 partner_bookmarks_shim_->GetPartnerBookmarksRoot());
208 }
209 }
210 std::size_t special_count = top_level_folders.size();
211
212 if (get_normal) {
213 DCHECK_EQ(bookmark_model_->root_node()->child_count(), 4);
214
215 top_level_folders.push_back(bookmark_model_->bookmark_bar_node());
216
217 const BookmarkNode* mobile_node = bookmark_model_->mobile_node();
218 for (int i = 0; i < mobile_node->child_count(); ++i) {
219 const BookmarkNode* node = mobile_node->GetChild(i);
220 if (node->is_folder()) {
221 top_level_folders.push_back(node);
222 }
223 }
224
225 const BookmarkNode* other_node = bookmark_model_->other_node();
226 for (int i = 0; i < other_node->child_count(); ++i) {
227 const BookmarkNode* node = other_node->GetChild(i);
228 if (node->is_folder()) {
229 top_level_folders.push_back(node);
230 }
231 }
232
233 scoped_ptr<icu::Collator> collator = GetICUCollator();
234 std::stable_sort(top_level_folders.begin() + special_count,
235 top_level_folders.end(),
236 BookmarkTitleComparer(collator.get()));
237 }
238
239 for (std::vector<const BookmarkNode*>::const_iterator it =
240 top_level_folders.begin(); it != top_level_folders.end(); ++it) {
241 Java_BookmarksBridge_addToBookmarkIdList(env,
242 j_result_obj,
243 (*it)->id(),
244 GetBookmarkType(*it));
245 }
246 }
247
147 void BookmarksBridge::GetChildIDs(JNIEnv* env, 248 void BookmarksBridge::GetChildIDs(JNIEnv* env,
148 jobject obj, 249 jobject obj,
149 jlong id, 250 jlong id,
150 jint type, 251 jint type,
151 jboolean get_folders, 252 jboolean get_folders,
152 jboolean get_bookmarks, 253 jboolean get_bookmarks,
153 jobject j_result_obj) { 254 jobject j_result_obj) {
154 DCHECK(IsLoaded()); 255 DCHECK(IsLoaded());
155 256
156 const BookmarkNode* parent = GetNodeByID(id, type); 257 const BookmarkNode* parent = GetNodeByID(id, type);
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after
652 BookmarkModelChanged(); 753 BookmarkModelChanged();
653 } 754 }
654 755
655 void BookmarksBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) { 756 void BookmarksBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) {
656 NotifyIfDoneLoading(); 757 NotifyIfDoneLoading();
657 } 758 }
658 759
659 void BookmarksBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) { 760 void BookmarksBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) {
660 partner_bookmarks_shim_ = NULL; 761 partner_bookmarks_shim_ = NULL;
661 } 762 }
OLDNEW
« no previous file with comments | « chrome/browser/android/bookmarks/bookmarks_bridge.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698