Commit f55b927b authored by Ryan Landay's avatar Ryan Landay Committed by Commit Bot

Make Memex button open in separate tab that gets reused

This change makes the Memex button (which replaces the tab switcher button if a
flag is enabled) open the Memex UI in a new tab if it's not currently open (to
avoid clobbering the current tab), or if a Memex tab is already open, switch to
that tab.

Change-Id: I71056e004bea7ad998d418d056aad298d71ba5b2
Reviewed-on: https://chromium-review.googlesource.com/922460Reviewed-by: default avatarMegan Jablonski <megjablon@chromium.org>
Reviewed-by: default avatarTed Choc <tedchoc@chromium.org>
Commit-Queue: Ryan Landay <rlanday@chromium.org>
Cr-Commit-Position: refs/heads/master@{#537499}
parent 7a07bc98
......@@ -125,7 +125,8 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe
*/
public static final int MINIMUM_LOAD_PROGRESS = 5;
private static final String CHROME_MEMEX_URL = "https://chrome-memex.appspot.com";
private static final String CHROME_MEMEX_URL = "https://chrome-memex.appspot.com/";
private static final String CHROME_MEMEX_DEV_URL = "https://chrome-memex-dev.appspot.com/";
private final ToolbarLayout mToolbar;
private final ToolbarControlContainer mControlContainer;
......@@ -999,9 +1000,18 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe
@Override
public void openMemexUI() {
Tab currentTab = mToolbarModel.getTab();
if (currentTab == null) return;
currentTab.loadUrl(new LoadUrlParams(CHROME_MEMEX_URL, PageTransition.AUTO_BOOKMARK));
TabModel model = mTabModelSelector.getModel(false);
for (int i = 0; i < model.getCount(); i++) {
String url = model.getTabAt(i).getUrl();
if (url.startsWith(CHROME_MEMEX_URL) || url.startsWith(CHROME_MEMEX_DEV_URL)) {
model.setIndex(i, TabSelectionType.FROM_USER);
return;
}
}
mTabModelSelector.openNewTab(
new LoadUrlParams(CHROME_MEMEX_URL, PageTransition.AUTO_BOOKMARK),
TabLaunchType.FROM_CHROME_UI, null, false);
}
/**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment