chrome/android/testshell/java/src/org/chromium/chrome/shell/ChromiumTestShellActivity.java - Issue 185113002: Add UI hook for distilling web pages for test shell.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/testshell/java/src/org/chromium/chrome/shell/ChromiumTestShellActivity.java

Issue 185113002: Add UI hook for distilling web pages for test shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased after testshell->shell change Created 6 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/testshell/java/DEPS ('k') | chrome/android/testshell/java/src/org/chromium/chrome/shell/TestShellSwitches.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/testshell/java/src/org/chromium/chrome/shell/ChromiumTestShellActivity.java

diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/shell/ChromiumTestShellActivity.java b/chrome/android/testshell/java/src/org/chromium/chrome/shell/ChromiumTestShellActivity.java

index f82d707bcf6e99a0ed89f7fa81409aea337d7c2e..349afc1cccd342cc5db723dd3f85339c7476fb39 100644

--- a/chrome/android/testshell/java/src/org/chromium/chrome/shell/ChromiumTestShellActivity.java

+++ b/chrome/android/testshell/java/src/org/chromium/chrome/shell/ChromiumTestShellActivity.java

@@ -28,6 +28,7 @@ import org.chromium.chrome.browser.appmenu.AppMenuPropertiesDelegate;

import org.chromium.chrome.browser.printing.PrintingControllerFactory;

import org.chromium.chrome.browser.printing.TabPrinter;

import org.chromium.chrome.shell.sync.SyncController;

+import org.chromium.components.dom_distiller.core.DomDistillerUrlUtils;

import org.chromium.content.browser.ActivityContentVideoViewClient;

import org.chromium.content.browser.BrowserStartupController;

import org.chromium.content.browser.ContentView;

@@ -42,6 +43,7 @@ import org.chromium.ui.base.WindowAndroid;

public class ChromiumTestShellActivity extends Activity implements AppMenuPropertiesDelegate {

private static final String TAG = "ChromiumTestShellActivity";

+ private static final String CHROME_DISTILLER_SCHEME = "chrome-distiller";

private WindowAndroid mWindow;

private TabManager mTabManager;

@@ -233,6 +235,12 @@ public class ChromiumTestShellActivity extends Activity implements AppMenuProper

mPrintingController.startPrint(new TabPrinter(getActiveTab()));

}

return true;

+ case R.id.distill_page:

+ TestShellTab activeTab = getActiveTab();

+ String viewUrl = DomDistillerUrlUtils.getDistillerViewUrlFromUrl(

+ CHROME_DISTILLER_SCHEME, getActiveTab().getUrl());

+ activeTab.loadUrlWithSanitization(viewUrl);

+ return true;

case R.id.back_menu_id:

if (getActiveTab().canGoBack()) getActiveTab().goBack();

return true;

@@ -283,6 +291,9 @@ public class ChromiumTestShellActivity extends Activity implements AppMenuProper

menu.findItem(R.id.print).setVisible(ApiCompatibilityUtils.isPrintingSupported());

+ menu.findItem(R.id.distill_page).setVisible(

+ CommandLine.getInstance().hasSwitch(TestShellSwitches.ENABLE_DOM_DISTILLER));

menu.setGroupVisible(R.id.MAIN_MENU, true);

}