Backout 90d6f7ce0fc2 (bug 920935) not needed anymore (r=backout)
authorLucas Rocha <lucasr@mozilla.com>
Tue, 05 Nov 2013 15:17:02 +0000
changeset 153598 ec8042ab407537bd0c5cdea49e65f05bb48c290c
parent 153597 ebed32c70afaf16f03b07d1045826cf5a027b0c1
child 153599 eb5d47884a27eb2817d4b4ae8de842a41a6de8cf
push id25595
push userryanvm@gmail.com
push dateTue, 05 Nov 2013 20:19:27 +0000
treeherdermozilla-central@2ada3a06d5e7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs920935
milestone28.0a1
backs out90d6f7ce0fc2172199550663c70ca2fdaa102274
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
Backout 90d6f7ce0fc2 (bug 920935) not needed anymore (r=backout)
mobile/android/base/BrowserApp.java
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -32,17 +32,16 @@ import org.mozilla.gecko.widget.GeckoAct
 import org.mozilla.gecko.widget.ButtonToast;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.content.ContentResolver;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.Rect;
@@ -1470,25 +1469,16 @@ abstract public class BrowserApp extends
 
                 // If there isn't a bookmark keyword, load the url. This may result in a query
                 // using the default search engine.
                 if (TextUtils.isEmpty(keywordUrl)) {
                     Tabs.getInstance().loadUrl(url, Tabs.LOADURL_USER_ENTERED);
                     return;
                 }
 
-                // If the keywordUrl is in ReadingList, convert the url to an about:reader url and load it.
-                final ContentResolver cr = getContentResolver();
-                final boolean inReadingList = BrowserDB.isReadingListItem(cr, keywordUrl);
-                if (inReadingList) {
-                    final String readerUrl = ReaderModeUtils.getAboutReaderForUrl(keywordUrl);
-                    Tabs.getInstance().loadUrl(readerUrl, Tabs.LOADURL_USER_ENTERED);
-                    return;
-                }
-
                 recordSearch(null, "barkeyword");
 
                 // Otherwise, construct a search query from the bookmark keyword.
                 final String searchUrl = keywordUrl.replace("%s", URLEncoder.encode(keywordSearch));
                 Tabs.getInstance().loadUrl(searchUrl, Tabs.LOADURL_USER_ENTERED);
             }
         });
     }