chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java - Issue 978653002: Upstream FirstRunActivity and friends.

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 978653002: Upstream FirstRunActivity and friends. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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

« chrome/android/java/src/org/chromium/chrome/browser/ChromiumApplication.java ('K') | « chrome/android/java/strings/android_chrome_strings.grd ('k') | chrome/browser/android/chromium_application.cc » ('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..7a6adb39ef4aaa405b59320de0b4ec9e530ef2c0 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

@@ -11,6 +11,7 @@ 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.firstrun.FirstRunActivity;

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

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

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

@@ -109,6 +110,11 @@ public class ChromeShellApplication extends ChromiumApplication {

}

@Override

+ public String getFirstRunActivityName() {

+ return FirstRunActivity.class.getName();

+ }

+ @Override

protected boolean areParentalControlsEnabled() {

return false;

}