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

Unified Diff: components/enhanced_bookmarks/android/enhanced_bookmarks_bridge.cc

Issue 597253003: Migrate EnhancedBookmarkBridge from component to chrome/browswer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased 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 side-by-side diff with in-line comments
Download patch
Index: components/enhanced_bookmarks/android/enhanced_bookmarks_bridge.cc
diff --git a/components/enhanced_bookmarks/android/enhanced_bookmarks_bridge.cc b/components/enhanced_bookmarks/android/enhanced_bookmarks_bridge.cc
deleted file mode 100644
index 445f746c41cae96a8c61d92d5f61314a17428849..0000000000000000000000000000000000000000
--- a/components/enhanced_bookmarks/android/enhanced_bookmarks_bridge.cc
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "components/enhanced_bookmarks/android/enhanced_bookmarks_bridge.h"
-
-#include "base/android/jni_string.h"
-#include "components/bookmarks/browser/bookmark_model.h"
-#include "components/bookmarks/browser/bookmark_utils.h"
-#include "components/bookmarks/common/android/bookmark_type.h"
-#include "components/enhanced_bookmarks/metadata_accessor.h"
-#include "jni/EnhancedBookmarksBridge_jni.h"
-
-using bookmarks::BookmarkType;
-
-namespace enhanced_bookmarks {
-namespace android {
-
-EnhancedBookmarksBridge::EnhancedBookmarksBridge(JNIEnv* env,
- jobject obj,
- jlong bookmark_model_ptr) {
- bookmark_model_ = reinterpret_cast<BookmarkModel*>(bookmark_model_ptr);
-}
-
-void EnhancedBookmarksBridge::Destroy(JNIEnv*, jobject) {
- delete this;
-}
-
-ScopedJavaLocalRef<jstring> EnhancedBookmarksBridge::GetBookmarkDescription(
- JNIEnv* env, jobject obj, jlong id, jint type) {
- DCHECK(bookmark_model_->loaded());
- DCHECK_EQ(type, BookmarkType::NORMAL);
-
- const BookmarkNode* node = bookmarks::GetBookmarkNodeByID(
- bookmark_model_, static_cast<int64>(id));
-
- return node ?
- base::android::ConvertUTF8ToJavaString(
- env, enhanced_bookmarks::DescriptionFromBookmark(node)) :
- ScopedJavaLocalRef<jstring>();
-}
-
-void EnhancedBookmarksBridge::SetBookmarkDescription(JNIEnv* env,
- jobject obj,
- jlong id,
- jint type,
- jstring description) {
- DCHECK(bookmark_model_->loaded());
- DCHECK_EQ(type, BookmarkType::NORMAL);
-
- const BookmarkNode* node = bookmarks::GetBookmarkNodeByID(
- bookmark_model_, static_cast<int64>(id));
-
- enhanced_bookmarks::SetDescriptionForBookmark(
- bookmark_model_, node,
- base::android::ConvertJavaStringToUTF8(env, description));
-}
-
-static jlong Init(JNIEnv* env, jobject obj, jlong bookmark_model_ptr) {
- return reinterpret_cast<jlong>(
- new EnhancedBookmarksBridge(env, obj, bookmark_model_ptr));
-}
-
-bool RegisterEnhancedBookmarksBridge(JNIEnv* env) {
- return RegisterNativesImpl(env);
-}
-
-} // namespace android
-} // namespace enhanced_bookmarks

Powered by Google App Engine
This is Rietveld 408576698