Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(561)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java

Issue 2219993002: Add @TargetApi to version dependent methods. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 4 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 | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
index 19f5186b7c1738c7cfa31d78bdbed6b9c9e1a321..1a26272263bde66a1c71615c4594117bce4d7332 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -4,6 +4,7 @@
package org.chromium.chrome.browser;
+import android.annotation.TargetApi;
import android.app.Activity;
import android.app.ActivityManager;
import android.content.Context;
@@ -1509,6 +1510,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode
* Merges tabs from a second ChromeTabbedActivity instance if necesssary and calls
* finishAndRemoveTask() on the other activity.
*/
+ @TargetApi(Build.VERSION_CODES.M)
@VisibleForTesting
public void maybeMergeTabs() {
if (!FeatureUtilities.isTabModelMergingEnabled()) return;
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698