Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / components / bookmarks / common / android / java / src / org / chromium / components / bookmarks / BookmarkId.java

diff --git a/src/components/bookmarks/common/android/java/src/org/chromium/components/bookmarks/BookmarkId.java b/src/components/bookmarks/common/android/java/src/org/chromium/components/bookmarks/BookmarkId.java
index 88764fe..e7e26fe 100644 (file)
--- a/src/components/bookmarks/common/android/java/src/org/chromium/components/bookmarks/BookmarkId.java
+++ b/src/components/bookmarks/common/android/java/src/org/chromium/components/bookmarks/BookmarkId.java
@@ -34,9 +34,9 @@ public class BookmarkId {
     private static int getBookmarkTypeFromChar(char c) {
         switch (c) {
             case TYPE_PARTNER:
-                return BookmarkType.BOOKMARK_TYPE_PARTNER;
+                return BookmarkType.PARTNER;
             default:
-                return BookmarkType.BOOKMARK_TYPE_NORMAL;
+                return BookmarkType.NORMAL;
         }
     }
 
@@ -55,7 +55,7 @@ public class BookmarkId {
      */
     public static BookmarkId getBookmarkIdFromString(String s) {
         long id = ROOT_FOLDER_ID;
-        int type = BookmarkType.BOOKMARK_TYPE_NORMAL;
+        int type = BookmarkType.NORMAL;
         if (TextUtils.isEmpty(s))
             return new BookmarkId(id, type);
         char folderTypeChar = s.charAt(0);
@@ -87,11 +87,21 @@ public class BookmarkId {
         return mType;
     }
 
+    /**
+     * @param id The id of the bookmark.
+     * @param type The bookmark type.
+     * @return The BookmarkId Object.
+     */
+    @CalledByNative
+    private static BookmarkId createBookmarkId(long id, int type) {
+        return new BookmarkId(id, type);
+    }
+
     private String getBookmarkTypeString() {
         switch (mType) {
-            case BookmarkType.BOOKMARK_TYPE_PARTNER:
+            case BookmarkType.PARTNER:
                 return String.valueOf(TYPE_PARTNER);
-            case BookmarkType.BOOKMARK_TYPE_NORMAL:
+            case BookmarkType.NORMAL:
             default:
                 return "";
         }