Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / android / java / src / org / chromium / chrome / browser / ChromeBrowserProvider.java

diff --git a/src/chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java b/src/chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java
index 03c1763..c12e656 100644 (file)
--- a/src/chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java
+++ b/src/chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java
@@ -10,12 +10,10 @@ import android.content.ContentProvider;
 import android.content.ContentUris;
 import android.content.ContentValues;
 import android.content.Context;
-import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.UriMatcher;
 import android.database.Cursor;
 import android.database.MatrixCursor;
-import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Binder;
 import android.os.Build;
@@ -645,7 +643,7 @@ public class ChromeBrowserProvider extends ContentProvider {
         // then use the synced node (Mobile Bookmarks).
         BookmarkNode lastModified = getBookmarkNode(getLastModifiedBookmarkFolderId(), false, false,
                 false, false);
-        if (lastModified == null) {
+        if (lastModified == null || lastModified.isUrl()) {
             lastModified = getMobileBookmarksFolder();
             mLastModifiedBookmarkFolderId = lastModified != null ? lastModified.id() :
                     INVALID_BOOKMARK_ID;
@@ -1271,15 +1269,6 @@ public class ChromeBrowserProvider extends ContentProvider {
         }
     }
 
-    /**
-     * Call to get the intent to create a bookmark shortcut on homescreen.
-     */
-    public static Intent getShortcutToBookmark(String url, String title, Bitmap favicon, int rValue,
-            int gValue, int bValue, Context context) {
-        return BookmarkUtils.createAddToHomeIntent(
-                context, url, title, favicon, rValue, gValue, bValue);
-    }
-
     @SuppressLint("NewApi")
     private void notifyChange(final Uri uri) {
         // If the calling user is different than current one, we need to post a