chrome/browser/android/shortcut_helper.cc - Issue 2259093003: Move native "enable-webapk" check to ChromeWebApkHost.

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/browser/android/shortcut_helper.cc

Issue 2259093003: Move native "enable-webapk" check to ChromeWebApkHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix compile error. Created 4 years, 4 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/java/src/org/chromium/chrome/browser/webapps/ChromeWebApkHost.java ('k') | chrome/browser/android/webapk/chrome_webapk_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/android/shortcut_helper.cc

diff --git a/chrome/browser/android/shortcut_helper.cc b/chrome/browser/android/shortcut_helper.cc

index c30ff516b35a0fde359c6d43e5967e9f94c937d4..6c4469059144a971b1d7208b19ad9f9f71e9adcb 100644

--- a/chrome/browser/android/shortcut_helper.cc

+++ b/chrome/browser/android/shortcut_helper.cc

@@ -14,6 +14,7 @@

#include "base/command_line.h"

#include "base/strings/string16.h"

#include "base/strings/utf_string_conversions.h"

+#include "chrome/browser/android/webapk/chrome_webapk_host.h"

#include "chrome/browser/android/webapk/webapk_installer.h"

#include "chrome/browser/manifest/manifest_icon_downloader.h"

#include "chrome/common/chrome_switches.h"

@@ -72,8 +73,7 @@ void ShortcutHelper::AddToLauncherWithSkBitmap(

const base::Closure& splash_image_callback) {

if (info.display == blink::WebDisplayModeStandalone ||

info.display == blink::WebDisplayModeFullscreen) {

- JNIEnv* env = base::android::AttachCurrentThread();

- if (Java_ShortcutHelper_areWebApksEnabled(env)) {

+ if (ChromeWebApkHost::AreWebApkEnabled()) {

InstallWebApkWithSkBitmap(browser_context, info, icon_bitmap);

return;

}