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

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: chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.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:

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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.chrome.browser;	5 package org.chromium.chrome.browser;

6	6

7 import android.app.ActivityManager;	7 import android.app.ActivityManager;

8 import android.app.SearchManager;	8 import android.app.SearchManager;

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

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

(...skipping 1311 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1322	1322

1323 @Override	1323 @Override

1324 public void onOverviewModeFinishedShowing() { }	1324 public void onOverviewModeFinishedShowing() { }

1325	1325

1326 @Override	1326 @Override

1327 public void onOverviewModeStartedHiding(boolean showToolbar, boolean delayAn imation) {}	1327 public void onOverviewModeStartedHiding(boolean showToolbar, boolean delayAn imation) {}

1328	1328

1329 @Override	1329 @Override

1330 public void onOverviewModeFinishedHiding() {}	1330 public void onOverviewModeFinishedHiding() {}

1331 }	1331 }

OLD	NEW