chrome/android/java_staging/src/org/chromium/chrome/browser/firstrun/FirstRunActivityStaging.java - Issue 1206673003: Merge java_staging/src into java/src.

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_staging/src/org/chromium/chrome/browser/firstrun/FirstRunActivityStaging.java

Issue 1206673003: Merge java_staging/src into java/src. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 5 years, 6 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_staging/src/org/chromium/chrome/browser/feedback/ScreenshotTask.java ('k') | chrome/android/java_staging/src/org/chromium/chrome/browser/gcore/ChromeGoogleApiClient.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java_staging/src/org/chromium/chrome/browser/firstrun/FirstRunActivityStaging.java

diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/firstrun/FirstRunActivityStaging.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/firstrun/FirstRunActivityStaging.java

deleted file mode 100644

index 761b8269e36222429da281f5fc383d63dfaa902b..0000000000000000000000000000000000000000

--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/firstrun/FirstRunActivityStaging.java

+++ /dev/null

@@ -1,18 +0,0 @@

-// Use of this source code is governed by a BSD-style license that can be

-// found in the LICENSE file.

-package org.chromium.chrome.browser.firstrun;

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

-/**

- * Staging version of FirstRunActivity. This class should be merged into FirstRunActivity

- * once it's upstreamed.

- */

-public class FirstRunActivityStaging extends FirstRunActivity {

- @Override

- public void showEmbedContentViewActivity(int title, int url) {

- EmbedContentViewActivity.show(this, title, url);

- }