Bug 896716: Both open in new tab and private tab both be available in context menu. [r=margaret]

This commit is contained in:
Sriram Ramasubramanian 2013-07-23 15:04:22 -07:00
parent 7bcfed2f29
commit b3ca8766fd
2 changed files with 0 additions and 21 deletions

View File

@ -7,7 +7,6 @@ package org.mozilla.gecko.home;
import org.mozilla.gecko.Favicons;
import org.mozilla.gecko.R;
import org.mozilla.gecko.Tab;
import org.mozilla.gecko.Tabs;
import org.mozilla.gecko.db.BrowserContract.Bookmarks;
import org.mozilla.gecko.db.BrowserContract.Thumbnails;
@ -211,16 +210,6 @@ public class BookmarksPage extends HomeFragment {
TopBookmarksContextMenuInfo info = (TopBookmarksContextMenuInfo) menuInfo;
if (!TextUtils.isEmpty(info.url)) {
// Show Open Private Tab if we're in private mode, Open New Tab otherwise
boolean isPrivate = false;
Tab tab = Tabs.getInstance().getSelectedTab();
if (tab != null) {
isPrivate = tab.isPrivate();
}
menu.findItem(R.id.top_bookmarks_open_new_tab).setVisible(!isPrivate);
menu.findItem(R.id.top_bookmarks_open_private_tab).setVisible(isPrivate);
if (info.isPinned) {
menu.findItem(R.id.top_bookmarks_pin).setVisible(false);
} else {

View File

@ -9,7 +9,6 @@ import org.mozilla.gecko.EditBookmarkDialog;
import org.mozilla.gecko.GeckoAppShell;
import org.mozilla.gecko.GeckoEvent;
import org.mozilla.gecko.R;
import org.mozilla.gecko.Tab;
import org.mozilla.gecko.Tabs;
import org.mozilla.gecko.db.BrowserDB;
import org.mozilla.gecko.gfx.BitmapUtils;
@ -66,15 +65,6 @@ class HomeFragment extends Fragment {
MenuInflater inflater = new MenuInflater(view.getContext());
inflater.inflate(R.menu.home_contextmenu, menu);
// Show Open Private Tab if we're in private mode, Open New Tab otherwise
boolean isPrivate = false;
Tab tab = Tabs.getInstance().getSelectedTab();
if (tab != null) {
isPrivate = tab.isPrivate();
}
menu.findItem(R.id.home_open_new_tab).setVisible(!isPrivate);
menu.findItem(R.id.home_open_private_tab).setVisible(isPrivate);
// Hide "Remove" item if there isn't a valid history ID
if (info.rowId < 0) {
menu.findItem(R.id.home_remove_history).setVisible(false);