chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappActivity.java - Issue 1354323003: Fix up _some_web app directory StrictMode violations

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/java/src/org/chromium/chrome/browser/webapps/WebappActivity.java

Issue 1354323003: Fix up _some_web app directory StrictMode violations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixing conditional Created 5 years, 3 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

« base/android/java/src/org/chromium/base/FileUtilities.java ('K') | « base/android/java/src/org/chromium/base/FileUtilities.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappDirectoryManager.java » ('j') | chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappDirectoryManager.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappActivity.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappActivity.java

index 1912b565e9877cc30608894e1893de9ebd040cd3..945a9645acdd4855e7534dbe4fc7006adff272eb 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappActivity.java

@@ -33,7 +33,6 @@ import org.chromium.chrome.browser.tab.EmptyTabObserver;

import org.chromium.chrome.browser.tab.Tab;

import org.chromium.chrome.browser.tab.TabObserver;

import org.chromium.chrome.browser.util.ColorUtils;

-import org.chromium.chrome.browser.util.FeatureUtilities;

import org.chromium.content.browser.ScreenOrientationProvider;

import org.chromium.content_public.browser.LoadUrlParams;

import org.chromium.content_public.browser.WebContentsObserver;

@@ -52,7 +51,7 @@ public class WebappActivity extends FullScreenActivity {

private static final long MS_BEFORE_NAVIGATING_BACK_FROM_INTERSTITIAL = 1000;

private final WebappInfo mWebappInfo;

- private AsyncTask<Void, Void, Void> mCleanupTask;

+ private AsyncTask<WebappActivity, Void, Void> mCleanupTask;

private WebContentsObserver mWebContentsObserver;

@@ -109,8 +108,7 @@ public class WebappActivity extends FullScreenActivity {

WebappInfo info = WebappInfo.create(getIntent());

if (info != null) mWebappInfo.copy(info);

- mCleanupTask = new WebappDirectoryManager(getActivityDirectory(),

- WEBAPP_SCHEME, FeatureUtilities.isDocumentModeEligible(this));

+ mCleanupTask = new WebappDirectoryManager();

ScreenOrientationProvider.lockOrientation((byte) mWebappInfo.orientation(), this);

super.preInflationStartup();

@@ -133,7 +131,7 @@ public class WebappActivity extends FullScreenActivity {

@Override

public void onStartWithNative() {

super.onStartWithNative();

- if (mCleanupTask.getStatus() == AsyncTask.Status.PENDING) mCleanupTask.execute();

+ if (mCleanupTask.getStatus() == AsyncTask.Status.PENDING) mCleanupTask.execute(this);

}

@Override