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

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

Issue 1105413002: Avoid conversion of index to BookmarkNode pointer unnacessarily. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changes as per review comments. Created 5 years, 7 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 | « no previous file | chrome/browser/android/provider/chrome_browser_provider.cc » ('j') | 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_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"
(...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after
607 DCHECK(IsLoaded()); 607 DCHECK(IsLoaded());
608 608
609 long bookmark_id = JavaBookmarkIdGetId(env, j_bookmark_id_obj); 609 long bookmark_id = JavaBookmarkIdGetId(env, j_bookmark_id_obj);
610 int type = JavaBookmarkIdGetType(env, j_bookmark_id_obj); 610 int type = JavaBookmarkIdGetType(env, j_bookmark_id_obj);
611 const BookmarkNode* node = GetNodeByID(bookmark_id, type); 611 const BookmarkNode* node = GetNodeByID(bookmark_id, type);
612 if (!IsEditable(node)) { 612 if (!IsEditable(node)) {
613 NOTREACHED(); 613 NOTREACHED();
614 return; 614 return;
615 } 615 }
616 616
617 if (partner_bookmarks_shim_->IsPartnerBookmark(node)) { 617 if (partner_bookmarks_shim_->IsPartnerBookmark(node))
618 partner_bookmarks_shim_->RemoveBookmark(node); 618 partner_bookmarks_shim_->RemoveBookmark(node);
619 } else { 619 else
620 const BookmarkNode* parent_node = GetParentNode(node); 620 bookmark_model_->Remove(node);
621 bookmark_model_->Remove(parent_node, parent_node->GetIndexOf(node));
622 }
623 } 621 }
624 622
625 void BookmarksBridge::MoveBookmark(JNIEnv* env, 623 void BookmarksBridge::MoveBookmark(JNIEnv* env,
626 jobject obj, 624 jobject obj,
627 jobject j_bookmark_id_obj, 625 jobject j_bookmark_id_obj,
628 jobject j_parent_id_obj, 626 jobject j_parent_id_obj,
629 jint index) { 627 jint index) {
630 DCHECK_CURRENTLY_ON(BrowserThread::UI); 628 DCHECK_CURRENTLY_ON(BrowserThread::UI);
631 DCHECK(IsLoaded()); 629 DCHECK(IsLoaded());
632 630
(...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after
1034 BookmarkModelChanged(); 1032 BookmarkModelChanged();
1035 } 1033 }
1036 1034
1037 void BookmarksBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) { 1035 void BookmarksBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) {
1038 NotifyIfDoneLoading(); 1036 NotifyIfDoneLoading();
1039 } 1037 }
1040 1038
1041 void BookmarksBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) { 1039 void BookmarksBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) {
1042 partner_bookmarks_shim_ = NULL; 1040 partner_bookmarks_shim_ = NULL;
1043 } 1041 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/android/provider/chrome_browser_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698