chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java - Issue 1063033002: Move ChromeShellPKCS11AuthenticationManager to Empty...

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/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java

Issue 1063033002: Move ChromeShellPKCS11AuthenticationManager to Empty... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fixed findbug error Created 5 years, 8 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/smartcard/PKCS11AuthenticationManager.java ('k') | chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellPKCS11AuthenticationManager.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java

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

index c99e84e968cfb1f55c90d9de0ac29d7b0c9f4f03..05f075651af3d53e38df02673f1c5360a5fa47fe 100644

--- a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java

+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java

@@ -10,11 +10,12 @@ import org.chromium.base.CommandLine;

import org.chromium.base.PathUtils;

import org.chromium.base.ResourceExtractor;

import org.chromium.chrome.browser.ChromiumApplication;

-import org.chromium.chrome.browser.PKCS11AuthenticationManager;

import org.chromium.chrome.browser.identity.UniqueIdentificationGeneratorFactory;

import org.chromium.chrome.browser.identity.UuidBasedUniqueIdentificationGenerator;

import org.chromium.chrome.browser.invalidation.UniqueIdInvalidationClientNameGenerator;

import org.chromium.chrome.browser.metrics.UmaUtils;

+import org.chromium.chrome.browser.smartcard.EmptyPKCS11AuthenticationManager;

+import org.chromium.chrome.browser.smartcard.PKCS11AuthenticationManager;

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

import org.chromium.chrome.shell.preferences.ChromeShellPreferences;

@@ -115,6 +116,6 @@ public class ChromeShellApplication extends ChromiumApplication {

@Override

protected PKCS11AuthenticationManager getPKCS11AuthenticationManager() {

- return new ChromeShellPKCS11AuthenticationManager();

+ return EmptyPKCS11AuthenticationManager.getInstance();

}