content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java - Issue 12088031: Revert 179189

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java

Issue 12088031: Revert 179189 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

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

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

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

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 package org.chromium.content_shell;	5 package org.chromium.content_shell;

6	6

7 import android.app.Activity;	7 import android.app.Activity;

8 import android.content.BroadcastReceiver;	8 import android.content.BroadcastReceiver;

9 import android.content.Context;	9 import android.content.Context;

10 import android.content.Intent;	10 import android.content.Intent;

(...skipping 194 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
205	205

206 /**	206 /**

207 * @return The {@link ContentView} owned by the currently visible {@link She ll} or null if one	207 * @return The {@link ContentView} owned by the currently visible {@link She ll} or null if one

208 * is not showing.	208 * is not showing.

209 */	209 */

210 public ContentView getActiveContentView() {	210 public ContentView getActiveContentView() {

211 Shell shell = getActiveShell();	211 Shell shell = getActiveShell();

212 return shell != null ? shell.getContentView() : null;	212 return shell != null ? shell.getContentView() : null;

213 }	213 }

214 }	214 }

OLD	NEW