Bug 893990: Remove KEYWORD column from bookmark search query. [r=margaret]
authorSriram Ramasubramanian <sriram@mozilla.com>
Tue, 16 Jul 2013 14:35:05 -0700
changeset 143408 782aeb850fccce8b986a4a7ba826afef8a681252
parent 143407 cc50c0290cf44bd8c7389387c2e0ed3bc38ecd51
child 143409 101158e5e30274d58997270037b3c7c5a6dbe4c7
push id25130
push userlrocha@mozilla.com
push dateWed, 21 Aug 2013 09:41:27 +0000
treeherdermozilla-central@b2486721572e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmargaret
bugs893990
milestone25.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 893990: Remove KEYWORD column from bookmark search query. [r=margaret]
mobile/android/base/db/LocalBrowserDB.java
mobile/android/base/home/BookmarksPage.java
--- a/mobile/android/base/db/LocalBrowserDB.java
+++ b/mobile/android/base/db/LocalBrowserDB.java
@@ -64,18 +64,17 @@ public class LocalBrowserDB implements B
     private final Uri mThumbnailsUriWithProfile;
 
     private static final String[] DEFAULT_BOOKMARK_COLUMNS =
             new String[] { Bookmarks._ID,
                            Bookmarks.GUID,
                            Bookmarks.URL,
                            Bookmarks.TITLE,
                            Bookmarks.TYPE,
-                           Bookmarks.PARENT,
-                           Bookmarks.KEYWORD }; 
+                           Bookmarks.PARENT };
 
     public LocalBrowserDB(String profile) {
         mProfile = profile;
         mFolderIdMap = new HashMap<String, Long>();
         mDesktopBookmarksExist = null;
 
         mBookmarksUriWithProfile = appendProfile(Bookmarks.CONTENT_URI);
         mParentsUriWithProfile = appendProfile(Bookmarks.PARENTS_CONTENT_URI);
--- a/mobile/android/base/home/BookmarksPage.java
+++ b/mobile/android/base/home/BookmarksPage.java
@@ -42,17 +42,17 @@ public class BookmarksPage extends HomeF
 
     // Cursor loader ID for list of bookmarks.
     private static final int BOOKMARKS_LIST_LOADER_ID = 0;
 
     // Cursor loader ID for grid of bookmarks.
     private static final int TOP_BOOKMARKS_LOADER_ID = 1;
 
     // Loader ID for favicons.
-    private static final int FAVICONS_LOADER_ID = 2; 
+    private static final int FAVICONS_LOADER_ID = 2;
 
     // Loader ID for thumbnails.
     private static final int THUMBNAILS_LOADER_ID = 3;
 
     // Key for bookmarks folder id.
     private static final String BOOKMARKS_FOLDER_KEY = "folder_id";
 
     // Key for thumbnail urls.