diff options
| author | aurimas <aurimas@chromium.org> | 2015-07-30 12:51:06 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-30 19:51:46 +0000 |
| commit | ca3b8039302e6be7470b233cc8b7c6c817985d14 (patch) | |
| tree | 5d846ff3ec9c43b736483f7af8866db4173cab97 | |
| parent | a5597f6cabd7d88393f67a81df9bfe4965d574a3 (diff) | |
| download | chromium_src-ca3b8039302e6be7470b233cc8b7c6c817985d14.zip chromium_src-ca3b8039302e6be7470b233cc8b7c6c817985d14.tar.gz chromium_src-ca3b8039302e6be7470b233cc8b7c6c817985d14.tar.bz2 | |
Move JNI annotations to annotations package.
The rest of the annotations already live in this package,
so this CL moves CalledByNative, NativeCall, JNIAdditionalImport,
NativeClassQualifiedName and JNINamespace to the same package.
BUG=None
TBR=armansito@chromium.org,asvitkine@chromium.org,atwilson@chromium.org,avayvod@chromium.org,bauerb@chromium.org,boliu@chromium.org,brettw@chromium.org,dtrainor@chromium.org,gunsch@chromium.org,lambroslambrou@chromium.org,mef@chromium.org,mnaganov@chromium.org,mnissler@chromium.org,peter@chromium.org,qinmin@chromium.org,sky@chromium.org,yfriedman@chromium.org,yukawa@chromium.org,zea@chromium.org
Review URL: https://codereview.chromium.org/1263053002
Cr-Commit-Position: refs/heads/master@{#341175}
296 files changed, 496 insertions, 451 deletions
diff --git a/android_webview/java/src/org/chromium/android_webview/AndroidProtocolHandler.java b/android_webview/java/src/org/chromium/android_webview/AndroidProtocolHandler.java index 5309b9e..3db25bb 100644 --- a/android_webview/java/src/org/chromium/android_webview/AndroidProtocolHandler.java +++ b/android_webview/java/src/org/chromium/android_webview/AndroidProtocolHandler.java @@ -10,8 +10,8 @@ import android.net.Uri; import android.util.Log; import android.util.TypedValue; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import java.io.IOException; import java.io.InputStream; diff --git a/android_webview/java/src/org/chromium/android_webview/AwAutofillClient.java b/android_webview/java/src/org/chromium/android_webview/AwAutofillClient.java index a2b4211..683add2 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwAutofillClient.java +++ b/android_webview/java/src/org/chromium/android_webview/AwAutofillClient.java @@ -6,8 +6,8 @@ package org.chromium.android_webview; import android.view.ViewGroup; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.content.browser.ContentViewCore; import org.chromium.ui.DropdownItem; import org.chromium.ui.autofill.AutofillPopup; diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java index 8874bd7..a0e3278 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwContents.java +++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java @@ -43,11 +43,11 @@ import android.webkit.ValueCallback; import android.widget.OverScroller; import org.chromium.android_webview.permission.AwPermissionRequest; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.ThreadUtils; import org.chromium.base.TraceEvent; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.base.annotations.SuppressFBWarnings; import org.chromium.components.navigation_interception.InterceptNavigationDelegate; import org.chromium.components.navigation_interception.NavigationParams; diff --git a/android_webview/java/src/org/chromium/android_webview/AwContentsClientBridge.java b/android_webview/java/src/org/chromium/android_webview/AwContentsClientBridge.java index f86e54b..c1b03a1 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwContentsClientBridge.java +++ b/android_webview/java/src/org/chromium/android_webview/AwContentsClientBridge.java @@ -10,9 +10,9 @@ import android.net.http.SslError; import android.util.Log; import android.webkit.ValueCallback; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.ThreadUtils; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.net.AndroidPrivateKey; import org.chromium.net.DefaultAndroidKeyStore; diff --git a/android_webview/java/src/org/chromium/android_webview/AwContentsIoThreadClient.java b/android_webview/java/src/org/chromium/android_webview/AwContentsIoThreadClient.java index 07c0299..6179400 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwContentsIoThreadClient.java +++ b/android_webview/java/src/org/chromium/android_webview/AwContentsIoThreadClient.java @@ -4,8 +4,8 @@ package org.chromium.android_webview; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import java.util.HashMap; import java.util.Map; diff --git a/android_webview/java/src/org/chromium/android_webview/AwContentsStatics.java b/android_webview/java/src/org/chromium/android_webview/AwContentsStatics.java index f09b57b..4c6bf35 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwContentsStatics.java +++ b/android_webview/java/src/org/chromium/android_webview/AwContentsStatics.java @@ -4,9 +4,9 @@ package org.chromium.android_webview; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.ThreadUtils; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * Implementations of various static methods, and also a home for static diff --git a/android_webview/java/src/org/chromium/android_webview/AwCookieManager.java b/android_webview/java/src/org/chromium/android_webview/AwCookieManager.java index b34b7fe..b310b3d 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwCookieManager.java +++ b/android_webview/java/src/org/chromium/android_webview/AwCookieManager.java @@ -8,8 +8,8 @@ import android.os.Handler; import android.os.Looper; import android.webkit.ValueCallback; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * AwCookieManager manages cookies according to RFC2109 spec. diff --git a/android_webview/java/src/org/chromium/android_webview/AwDevToolsServer.java b/android_webview/java/src/org/chromium/android_webview/AwDevToolsServer.java index f4e683b..52a0ed9 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwDevToolsServer.java +++ b/android_webview/java/src/org/chromium/android_webview/AwDevToolsServer.java @@ -4,7 +4,7 @@ package org.chromium.android_webview; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.JNINamespace; /** * Controller for Remote Web Debugging (Developer Tools). diff --git a/android_webview/java/src/org/chromium/android_webview/AwFormDatabase.java b/android_webview/java/src/org/chromium/android_webview/AwFormDatabase.java index 9687a1c..0ede383 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwFormDatabase.java +++ b/android_webview/java/src/org/chromium/android_webview/AwFormDatabase.java @@ -4,7 +4,7 @@ package org.chromium.android_webview; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.JNINamespace; /** * Exposes a subset of Chromium form database to Webview database for managing autocomplete diff --git a/android_webview/java/src/org/chromium/android_webview/AwHttpAuthHandler.java b/android_webview/java/src/org/chromium/android_webview/AwHttpAuthHandler.java index 1f5d33d..ce5de94 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwHttpAuthHandler.java +++ b/android_webview/java/src/org/chromium/android_webview/AwHttpAuthHandler.java @@ -4,8 +4,8 @@ package org.chromium.android_webview; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * See {@link android.webkit.HttpAuthHandler}. diff --git a/android_webview/java/src/org/chromium/android_webview/AwMessagePortService.java b/android_webview/java/src/org/chromium/android_webview/AwMessagePortService.java index 039cd94..d9057a9 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwMessagePortService.java +++ b/android_webview/java/src/org/chromium/android_webview/AwMessagePortService.java @@ -6,10 +6,10 @@ package org.chromium.android_webview; import android.util.SparseArray; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.ObserverList; import org.chromium.base.ThreadUtils; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * Provides the Message Channel functionality for Android Webview. Specifically diff --git a/android_webview/java/src/org/chromium/android_webview/AwPdfExporter.java b/android_webview/java/src/org/chromium/android_webview/AwPdfExporter.java index d22afa7..d02ba66 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwPdfExporter.java +++ b/android_webview/java/src/org/chromium/android_webview/AwPdfExporter.java @@ -12,8 +12,8 @@ import android.util.Log; import android.view.ViewGroup; import android.webkit.ValueCallback; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * Export the android webview as a PDF. diff --git a/android_webview/java/src/org/chromium/android_webview/AwPicture.java b/android_webview/java/src/org/chromium/android_webview/AwPicture.java index 17eaa07..19162a0 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwPicture.java +++ b/android_webview/java/src/org/chromium/android_webview/AwPicture.java @@ -7,7 +7,7 @@ package org.chromium.android_webview; import android.graphics.Canvas; import android.graphics.Picture; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.JNINamespace; import org.chromium.content.common.CleanupReference; import java.io.OutputStream; diff --git a/android_webview/java/src/org/chromium/android_webview/AwQuotaManagerBridge.java b/android_webview/java/src/org/chromium/android_webview/AwQuotaManagerBridge.java index 0f83337..6b0144e 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwQuotaManagerBridge.java +++ b/android_webview/java/src/org/chromium/android_webview/AwQuotaManagerBridge.java @@ -7,9 +7,9 @@ package org.chromium.android_webview; import android.util.SparseArray; import android.webkit.ValueCallback; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.ThreadUtils; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * Bridge between android.webview.WebStorage and native QuotaManager. This object is owned by Java diff --git a/android_webview/java/src/org/chromium/android_webview/AwResource.java b/android_webview/java/src/org/chromium/android_webview/AwResource.java index 7939fe8..19662a8 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwResource.java +++ b/android_webview/java/src/org/chromium/android_webview/AwResource.java @@ -7,8 +7,8 @@ package org.chromium.android_webview; import android.content.res.Resources; import android.util.SparseArray; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import java.io.IOException; import java.io.InputStreamReader; diff --git a/android_webview/java/src/org/chromium/android_webview/AwSettings.java b/android_webview/java/src/org/chromium/android_webview/AwSettings.java index 27280b4..642e1af 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwSettings.java +++ b/android_webview/java/src/org/chromium/android_webview/AwSettings.java @@ -17,10 +17,10 @@ import android.webkit.WebSettings.LayoutAlgorithm; import android.webkit.WebSettings.PluginState; import android.webkit.WebSettings.ZoomDensity; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.ThreadUtils; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.content_public.browser.WebContents; /** diff --git a/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegate.java b/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegate.java index e8c4a5d..1455028 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegate.java +++ b/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegate.java @@ -4,9 +4,9 @@ package org.chromium.android_webview; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.components.web_contents_delegate_android.WebContentsDelegateAndroid; /** diff --git a/android_webview/java/src/org/chromium/android_webview/AwWebResourceResponse.java b/android_webview/java/src/org/chromium/android_webview/AwWebResourceResponse.java index bb0e05e..72aa3d6 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwWebResourceResponse.java +++ b/android_webview/java/src/org/chromium/android_webview/AwWebResourceResponse.java @@ -4,8 +4,8 @@ package org.chromium.android_webview; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import java.io.InputStream; import java.util.Map; diff --git a/android_webview/java/src/org/chromium/android_webview/InputStreamUtil.java b/android_webview/java/src/org/chromium/android_webview/InputStreamUtil.java index af12b60..ae5aad1 100644 --- a/android_webview/java/src/org/chromium/android_webview/InputStreamUtil.java +++ b/android_webview/java/src/org/chromium/android_webview/InputStreamUtil.java @@ -6,8 +6,8 @@ package org.chromium.android_webview; import android.util.Log; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import java.io.IOException; import java.io.InputStream; diff --git a/android_webview/java/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java b/android_webview/java/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java index 01c9366..13d5b55 100644 --- a/android_webview/java/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java +++ b/android_webview/java/src/org/chromium/android_webview/JavaBrowserViewRendererHelper.java @@ -7,8 +7,8 @@ package org.chromium.android_webview; import android.graphics.Bitmap; import android.graphics.Canvas; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * Provides auxiliary methods related to Picture objects and native SkPictures. diff --git a/android_webview/java/src/org/chromium/android_webview/permission/AwPermissionRequest.java b/android_webview/java/src/org/chromium/android_webview/permission/AwPermissionRequest.java index bab4935..b0f4744 100644 --- a/android_webview/java/src/org/chromium/android_webview/permission/AwPermissionRequest.java +++ b/android_webview/java/src/org/chromium/android_webview/permission/AwPermissionRequest.java @@ -6,9 +6,9 @@ package org.chromium.android_webview.permission; import android.net.Uri; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.ThreadUtils; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.content.common.CleanupReference; /** diff --git a/android_webview/unittestjava/src/org/chromium/android_webview/unittest/InputStreamUnittest.java b/android_webview/unittestjava/src/org/chromium/android_webview/unittest/InputStreamUnittest.java index 3b69ee7..d31a3c6 100644 --- a/android_webview/unittestjava/src/org/chromium/android_webview/unittest/InputStreamUnittest.java +++ b/android_webview/unittestjava/src/org/chromium/android_webview/unittest/InputStreamUnittest.java @@ -4,7 +4,7 @@ package org.chromium.android_webview.unittest; -import org.chromium.base.CalledByNative; +import org.chromium.base.annotations.CalledByNative; import java.io.IOException; import java.io.InputStream; diff --git a/android_webview/unittestjava/src/org/chromium/android_webview/unittest/MockAwContentsClientBridge.java b/android_webview/unittestjava/src/org/chromium/android_webview/unittest/MockAwContentsClientBridge.java index a64daaf..0be5824 100644 --- a/android_webview/unittestjava/src/org/chromium/android_webview/unittest/MockAwContentsClientBridge.java +++ b/android_webview/unittestjava/src/org/chromium/android_webview/unittest/MockAwContentsClientBridge.java @@ -6,7 +6,7 @@ package org.chromium.android_webview.unittest; import org.chromium.android_webview.AwContentsClientBridge; import org.chromium.android_webview.ClientCertLookupTable; -import org.chromium.base.CalledByNative; +import org.chromium.base.annotations.CalledByNative; import org.chromium.net.AndroidKeyStore; import org.chromium.net.AndroidPrivateKey; import org.chromium.net.DefaultAndroidKeyStore; diff --git a/base/android/java/src/org/chromium/base/ApkAssets.java b/base/android/java/src/org/chromium/base/ApkAssets.java index 329660f..e00be99 100644 --- a/base/android/java/src/org/chromium/base/ApkAssets.java +++ b/base/android/java/src/org/chromium/base/ApkAssets.java @@ -9,6 +9,9 @@ import android.content.res.AssetFileDescriptor; import android.content.res.AssetManager; import android.util.Log; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; + import java.io.IOException; /** diff --git a/base/android/java/src/org/chromium/base/ApplicationStatus.java b/base/android/java/src/org/chromium/base/ApplicationStatus.java index 8c36b61..5035b9c 100644 --- a/base/android/java/src/org/chromium/base/ApplicationStatus.java +++ b/base/android/java/src/org/chromium/base/ApplicationStatus.java @@ -10,6 +10,9 @@ import android.app.Application.ActivityLifecycleCallbacks; import android.content.Context; import android.os.Bundle; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; diff --git a/base/android/java/src/org/chromium/base/BuildInfo.java b/base/android/java/src/org/chromium/base/BuildInfo.java index c6d248d..f00c4c6 100644 --- a/base/android/java/src/org/chromium/base/BuildInfo.java +++ b/base/android/java/src/org/chromium/base/BuildInfo.java @@ -14,6 +14,8 @@ import android.os.Build; import android.text.TextUtils; import android.util.Log; +import org.chromium.base.annotations.CalledByNative; + /** * BuildInfo is a utility class providing easy access to {@link PackageInfo} * information. This is primarly of use for accessesing package information diff --git a/base/android/java/src/org/chromium/base/ContentUriUtils.java b/base/android/java/src/org/chromium/base/ContentUriUtils.java index 75a6e0c..6b5542a 100644 --- a/base/android/java/src/org/chromium/base/ContentUriUtils.java +++ b/base/android/java/src/org/chromium/base/ContentUriUtils.java @@ -11,6 +11,8 @@ import android.net.Uri; import android.os.ParcelFileDescriptor; import android.util.Log; +import org.chromium.base.annotations.CalledByNative; + import java.io.File; import java.io.FileNotFoundException; diff --git a/base/android/java/src/org/chromium/base/CpuFeatures.java b/base/android/java/src/org/chromium/base/CpuFeatures.java index 0e8a7ab..ae4969c 100644 --- a/base/android/java/src/org/chromium/base/CpuFeatures.java +++ b/base/android/java/src/org/chromium/base/CpuFeatures.java @@ -4,6 +4,8 @@ package org.chromium.base; +import org.chromium.base.annotations.JNINamespace; + // The only purpose of this class is to allow sending CPU properties // from the browser process to sandboxed renderer processes. This is // needed because sandboxed processes cannot, on ARM, query the kernel diff --git a/base/android/java/src/org/chromium/base/EventLog.java b/base/android/java/src/org/chromium/base/EventLog.java index 894de15..f889175 100644 --- a/base/android/java/src/org/chromium/base/EventLog.java +++ b/base/android/java/src/org/chromium/base/EventLog.java @@ -4,6 +4,9 @@ package org.chromium.base; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; + /** * A simple interface to Android's EventLog to be used by native code. */ diff --git a/base/android/java/src/org/chromium/base/ImportantFileWriterAndroid.java b/base/android/java/src/org/chromium/base/ImportantFileWriterAndroid.java index 3921cea..cbaf7f7 100644 --- a/base/android/java/src/org/chromium/base/ImportantFileWriterAndroid.java +++ b/base/android/java/src/org/chromium/base/ImportantFileWriterAndroid.java @@ -4,6 +4,8 @@ package org.chromium.base; +import org.chromium.base.annotations.JNINamespace; + /** * This class provides an interface to the native class for writing * important data files without risking data loss. diff --git a/base/android/java/src/org/chromium/base/JNIUtils.java b/base/android/java/src/org/chromium/base/JNIUtils.java index 6f6cd54..adbd36c 100644 --- a/base/android/java/src/org/chromium/base/JNIUtils.java +++ b/base/android/java/src/org/chromium/base/JNIUtils.java @@ -4,6 +4,8 @@ package org.chromium.base; +import org.chromium.base.annotations.CalledByNative; + /** * This class provides JNI-related methods to the native library. */ diff --git a/base/android/java/src/org/chromium/base/JavaHandlerThread.java b/base/android/java/src/org/chromium/base/JavaHandlerThread.java index 3153a9b..cd05728 100644 --- a/base/android/java/src/org/chromium/base/JavaHandlerThread.java +++ b/base/android/java/src/org/chromium/base/JavaHandlerThread.java @@ -9,6 +9,9 @@ import android.os.Build; import android.os.Handler; import android.os.HandlerThread; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; + /** * This class is an internal detail of the native counterpart. * It is instantiated and owned by the native object. diff --git a/base/android/java/src/org/chromium/base/LocaleUtils.java b/base/android/java/src/org/chromium/base/LocaleUtils.java index 82b2c8f..809fd6e 100644 --- a/base/android/java/src/org/chromium/base/LocaleUtils.java +++ b/base/android/java/src/org/chromium/base/LocaleUtils.java @@ -4,6 +4,8 @@ package org.chromium.base; +import org.chromium.base.annotations.CalledByNative; + import java.util.Locale; /** diff --git a/base/android/java/src/org/chromium/base/MemoryPressureListener.java b/base/android/java/src/org/chromium/base/MemoryPressureListener.java index 7979287..c1109ef 100644 --- a/base/android/java/src/org/chromium/base/MemoryPressureListener.java +++ b/base/android/java/src/org/chromium/base/MemoryPressureListener.java @@ -9,6 +9,8 @@ import android.content.ComponentCallbacks2; import android.content.Context; import android.content.res.Configuration; +import org.chromium.base.annotations.CalledByNative; + /** * This is an internal implementation of the C++ counterpart. diff --git a/base/android/java/src/org/chromium/base/PathService.java b/base/android/java/src/org/chromium/base/PathService.java index b22328c..9807c2e 100644 --- a/base/android/java/src/org/chromium/base/PathService.java +++ b/base/android/java/src/org/chromium/base/PathService.java @@ -4,6 +4,8 @@ package org.chromium.base; +import org.chromium.base.annotations.JNINamespace; + /** * This class provides java side access to the native PathService. */ diff --git a/base/android/java/src/org/chromium/base/PathUtils.java b/base/android/java/src/org/chromium/base/PathUtils.java index 77affe1..8d676fa 100644 --- a/base/android/java/src/org/chromium/base/PathUtils.java +++ b/base/android/java/src/org/chromium/base/PathUtils.java @@ -9,6 +9,8 @@ import android.content.pm.ApplicationInfo; import android.os.AsyncTask; import android.os.Environment; +import org.chromium.base.annotations.CalledByNative; + import java.io.File; import java.util.concurrent.ExecutionException; diff --git a/base/android/java/src/org/chromium/base/PowerMonitor.java b/base/android/java/src/org/chromium/base/PowerMonitor.java index 3d0ed48..485bc82 100644 --- a/base/android/java/src/org/chromium/base/PowerMonitor.java +++ b/base/android/java/src/org/chromium/base/PowerMonitor.java @@ -11,6 +11,9 @@ import android.os.BatteryManager; import android.os.Handler; import android.os.Looper; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; + /** * Integrates native PowerMonitor with the java side. diff --git a/base/android/java/src/org/chromium/base/SysUtils.java b/base/android/java/src/org/chromium/base/SysUtils.java index 2afe6fb..1393e8ee 100644 --- a/base/android/java/src/org/chromium/base/SysUtils.java +++ b/base/android/java/src/org/chromium/base/SysUtils.java @@ -11,6 +11,8 @@ import android.os.Build; import android.os.StrictMode; import android.util.Log; +import org.chromium.base.annotations.CalledByNative; + import java.io.BufferedReader; import java.io.FileReader; import java.util.regex.Matcher; diff --git a/base/android/java/src/org/chromium/base/SystemMessageHandler.java b/base/android/java/src/org/chromium/base/SystemMessageHandler.java index 10ce06b..37d5ef0 100644 --- a/base/android/java/src/org/chromium/base/SystemMessageHandler.java +++ b/base/android/java/src/org/chromium/base/SystemMessageHandler.java @@ -9,6 +9,8 @@ import android.os.Build; import android.os.Handler; import android.os.Message; +import org.chromium.base.annotations.CalledByNative; + import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/base/android/java/src/org/chromium/base/ThreadUtils.java b/base/android/java/src/org/chromium/base/ThreadUtils.java index 647e33e..da32552 100644 --- a/base/android/java/src/org/chromium/base/ThreadUtils.java +++ b/base/android/java/src/org/chromium/base/ThreadUtils.java @@ -8,6 +8,8 @@ import android.os.Handler; import android.os.Looper; import android.os.Process; +import org.chromium.base.annotations.CalledByNative; + import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import java.util.concurrent.FutureTask; diff --git a/base/android/java/src/org/chromium/base/TraceEvent.java b/base/android/java/src/org/chromium/base/TraceEvent.java index 9ace4a1..878275c 100644 --- a/base/android/java/src/org/chromium/base/TraceEvent.java +++ b/base/android/java/src/org/chromium/base/TraceEvent.java @@ -9,6 +9,9 @@ import android.os.MessageQueue; import android.os.SystemClock; import android.util.Log; import android.util.Printer; + +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * Java mirror of Chrome trace event API. See base/trace_event/trace_event.h. Unlike the native * version, Java does not have stack objects, so a TRACE_EVENT() which does both TRACE_EVENT_BEGIN() diff --git a/base/android/java/src/org/chromium/base/CalledByNative.java b/base/android/java/src/org/chromium/base/annotations/CalledByNative.java index 3e6315e..94ef3fa 100644 --- a/base/android/java/src/org/chromium/base/CalledByNative.java +++ b/base/android/java/src/org/chromium/base/annotations/CalledByNative.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package org.chromium.base; +package org.chromium.base.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/base/android/java/src/org/chromium/base/JNIAdditionalImport.java b/base/android/java/src/org/chromium/base/annotations/JNIAdditionalImport.java index 499d158..f1bf85e 100644 --- a/base/android/java/src/org/chromium/base/JNIAdditionalImport.java +++ b/base/android/java/src/org/chromium/base/annotations/JNIAdditionalImport.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package org.chromium.base; +package org.chromium.base.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/base/android/java/src/org/chromium/base/JNINamespace.java b/base/android/java/src/org/chromium/base/annotations/JNINamespace.java index 5ad7a42..4cd5531 100644 --- a/base/android/java/src/org/chromium/base/JNINamespace.java +++ b/base/android/java/src/org/chromium/base/annotations/JNINamespace.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package org.chromium.base; +package org.chromium.base.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/base/android/java/src/org/chromium/base/NativeCall.java b/base/android/java/src/org/chromium/base/annotations/NativeCall.java index 352edf7..b69cd17 100644 --- a/base/android/java/src/org/chromium/base/NativeCall.java +++ b/base/android/java/src/org/chromium/base/annotations/NativeCall.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package org.chromium.base; +package org.chromium.base.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/base/android/java/src/org/chromium/base/NativeClassQualifiedName.java b/base/android/java/src/org/chromium/base/annotations/NativeClassQualifiedName.java index e55b18c..afbc368 100644 --- a/base/android/java/src/org/chromium/base/NativeClassQualifiedName.java +++ b/base/android/java/src/org/chromium/base/annotations/NativeClassQualifiedName.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package org.chromium.base; +package org.chromium.base.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/base/android/java/src/org/chromium/base/library_loader/LegacyLinker.java b/base/android/java/src/org/chromium/base/library_loader/LegacyLinker.java index e8efae7..57299ce6 100644 --- a/base/android/java/src/org/chromium/base/library_loader/LegacyLinker.java +++ b/base/android/java/src/org/chromium/base/library_loader/LegacyLinker.java @@ -7,10 +7,10 @@ package org.chromium.base.library_loader; import android.os.Bundle; import android.os.Parcel; -import org.chromium.base.CalledByNative; import org.chromium.base.Log; import org.chromium.base.SysUtils; import org.chromium.base.ThreadUtils; +import org.chromium.base.annotations.CalledByNative; import java.util.HashMap; import java.util.Locale; diff --git a/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java b/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java index b17b1a1..5250bc4 100644 --- a/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java +++ b/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java @@ -12,12 +12,12 @@ import android.os.AsyncTask; import android.os.Build; import android.os.SystemClock; -import org.chromium.base.CalledByNative; import org.chromium.base.CommandLine; -import org.chromium.base.JNINamespace; import org.chromium.base.Log; import org.chromium.base.PackageUtils; import org.chromium.base.TraceEvent; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.base.metrics.RecordHistogram; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/base/android/java/src/org/chromium/base/metrics/RecordHistogram.java b/base/android/java/src/org/chromium/base/metrics/RecordHistogram.java index 2f4356b..d94b980 100644 --- a/base/android/java/src/org/chromium/base/metrics/RecordHistogram.java +++ b/base/android/java/src/org/chromium/base/metrics/RecordHistogram.java @@ -4,8 +4,8 @@ package org.chromium.base.metrics; -import org.chromium.base.JNINamespace; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.JNINamespace; import java.util.concurrent.TimeUnit; diff --git a/base/android/java/src/org/chromium/base/metrics/RecordUserAction.java b/base/android/java/src/org/chromium/base/metrics/RecordUserAction.java index d7cc32c..06004d6 100644 --- a/base/android/java/src/org/chromium/base/metrics/RecordUserAction.java +++ b/base/android/java/src/org/chromium/base/metrics/RecordUserAction.java @@ -4,8 +4,8 @@ package org.chromium.base.metrics; -import org.chromium.base.JNINamespace; import org.chromium.base.ThreadUtils; +import org.chromium.base.annotations.JNINamespace; /** * Java API for recording UMA actions. diff --git a/base/android/jni_generator/java/src/org/chromium/example/jni_generator/SampleForTests.java b/base/android/jni_generator/java/src/org/chromium/example/jni_generator/SampleForTests.java index dad59ce..c1fc667 100644 --- a/base/android/jni_generator/java/src/org/chromium/example/jni_generator/SampleForTests.java +++ b/base/android/jni_generator/java/src/org/chromium/example/jni_generator/SampleForTests.java @@ -6,11 +6,11 @@ package org.chromium.example.jni_generator; import android.graphics.Rect; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; -import org.chromium.base.NativeClassQualifiedName; import org.chromium.base.annotations.AccessedByNative; +import org.chromium.base.annotations.CalledByNative; import org.chromium.base.annotations.CalledByNativeUnchecked; +import org.chromium.base.annotations.JNINamespace; +import org.chromium.base.annotations.NativeClassQualifiedName; import java.util.ArrayList; import java.util.Iterator; diff --git a/base/android/jni_generator/jni_generator_tests.py b/base/android/jni_generator/jni_generator_tests.py index 21534ef..0350b0e 100755 --- a/base/android/jni_generator/jni_generator_tests.py +++ b/base/android/jni_generator/jni_generator_tests.py @@ -896,8 +896,8 @@ import android.view.Surface; import java.util.ArrayList; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.content.app.ContentMain; import org.chromium.content.browser.SandboxedProcessConnection; import org.chromium.content.common.ISandboxedProcessCallback; diff --git a/base/test/android/java/src/org/chromium/base/ContentUriTestUtils.java b/base/test/android/java/src/org/chromium/base/ContentUriTestUtils.java index 4a1613b..f6d5f60 100644 --- a/base/test/android/java/src/org/chromium/base/ContentUriTestUtils.java +++ b/base/test/android/java/src/org/chromium/base/ContentUriTestUtils.java @@ -10,6 +10,8 @@ import android.database.Cursor; import android.net.Uri; import android.provider.MediaStore; +import org.chromium.base.annotations.CalledByNative; + /** * Utilities for testing operations on content URI. */ diff --git a/base/test/android/java/src/org/chromium/base/TestUiThread.java b/base/test/android/java/src/org/chromium/base/TestUiThread.java index 4abec80..237c0ec 100644 --- a/base/test/android/java/src/org/chromium/base/TestUiThread.java +++ b/base/test/android/java/src/org/chromium/base/TestUiThread.java @@ -6,6 +6,8 @@ package org.chromium.base; import android.os.Looper; +import org.chromium.base.annotations.CalledByNative; + import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AccessibilityUtil.java b/chrome/android/java/src/org/chromium/chrome/browser/AccessibilityUtil.java index a9701f2..023e4b8 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/AccessibilityUtil.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/AccessibilityUtil.java @@ -12,8 +12,8 @@ import android.net.Uri; import android.support.v7.app.AlertDialog; import android.view.accessibility.AccessibilityManager; -import org.chromium.base.CalledByNative; import org.chromium.base.PackageUtils; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.R; import java.util.List; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ApplicationLifetime.java b/chrome/android/java/src/org/chromium/chrome/browser/ApplicationLifetime.java index e168da9..2f20687 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ApplicationLifetime.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ApplicationLifetime.java @@ -4,8 +4,8 @@ package org.chromium.chrome.browser; -import org.chromium.base.CalledByNative; import org.chromium.base.ObserverList; +import org.chromium.base.annotations.CalledByNative; /** * Watches for when Chrome is told to restart itself. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/BookmarksBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/BookmarksBridge.java index c73bd45..9c31845 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/BookmarksBridge.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/BookmarksBridge.java @@ -4,9 +4,9 @@ package org.chromium.chrome.browser; -import org.chromium.base.CalledByNative; import org.chromium.base.ObserverList; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.components.bookmarks.BookmarkId; import org.chromium.components.bookmarks.BookmarkType; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java index fd5407d..ce38c4a 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java @@ -25,12 +25,12 @@ import org.chromium.base.ApplicationState; import org.chromium.base.ApplicationStatus; import org.chromium.base.ApplicationStatus.ApplicationStateListener; import org.chromium.base.BuildInfo; -import org.chromium.base.CalledByNative; import org.chromium.base.PathUtils; import org.chromium.base.ResourceExtractor; import org.chromium.base.ThreadUtils; import org.chromium.base.TraceEvent; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; import org.chromium.base.annotations.SuppressFBWarnings; import org.chromium.base.library_loader.LibraryLoader; import org.chromium.base.library_loader.LibraryProcessType; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java index c40c808..71bace7 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java @@ -29,9 +29,9 @@ import android.util.Log; import android.util.LongSparseArray; import org.chromium.base.BuildInfo; -import org.chromium.base.CalledByNative; import org.chromium.base.ThreadUtils; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; import org.chromium.base.annotations.CalledByNativeUnchecked; import org.chromium.base.annotations.SuppressFBWarnings; import org.chromium.base.library_loader.LibraryProcessType; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeHttpAuthHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeHttpAuthHandler.java index 7a62fe2..3e2a07e 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeHttpAuthHandler.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeHttpAuthHandler.java @@ -6,7 +6,7 @@ package org.chromium.chrome.browser; import android.app.Activity; -import org.chromium.base.CalledByNative; +import org.chromium.base.annotations.CalledByNative; import org.chromium.ui.base.WindowAndroid; /** diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeWebContentsDelegateAndroid.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeWebContentsDelegateAndroid.java index f2c4389..b24d8ac 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeWebContentsDelegateAndroid.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeWebContentsDelegateAndroid.java @@ -7,7 +7,7 @@ package org.chromium.chrome.browser; import android.graphics.Rect; import android.graphics.RectF; -import org.chromium.base.CalledByNative; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.browser.findinpage.FindMatchRectsDetails; import org.chromium.chrome.browser.findinpage.FindNotificationDetails; import org.chromium.components.web_contents_delegate_android.WebContentsDelegateAndroid; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ConnectionInfoPopup.java b/chrome/android/java/src/org/chromium/chrome/browser/ConnectionInfoPopup.java index 08e8eb2..bb4384c 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ConnectionInfoPopup.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ConnectionInfoPopup.java @@ -22,8 +22,8 @@ import android.widget.LinearLayout; import android.widget.ScrollView; import android.widget.TextView; -import org.chromium.base.CalledByNative; import org.chromium.base.Log; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.R; import org.chromium.content_public.browser.WebContents; import org.chromium.content_public.browser.WebContentsObserver; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/DevToolsServer.java b/chrome/android/java/src/org/chromium/chrome/browser/DevToolsServer.java index 5f84994..343ba5b 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/DevToolsServer.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/DevToolsServer.java @@ -7,7 +7,7 @@ package org.chromium.chrome.browser; import android.content.Context; import android.content.pm.PackageManager; -import org.chromium.base.CalledByNative; +import org.chromium.base.annotations.CalledByNative; /** * Controller for Remote Web Debugging (Developer Tools). diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/IntentHelper.java index cccc655..c3a335a 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/IntentHelper.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/IntentHelper.java @@ -12,8 +12,8 @@ import android.text.Html; import android.text.TextUtils; import android.util.Patterns; -import org.chromium.base.CalledByNative; import org.chromium.base.ContentUriUtils; +import org.chromium.base.annotations.CalledByNative; import org.chromium.sync.signin.AccountManagerHelper; import java.io.File; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/JavaExceptionReporter.java b/chrome/android/java/src/org/chromium/chrome/browser/JavaExceptionReporter.java index 4c92f30..0091626 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/JavaExceptionReporter.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/JavaExceptionReporter.java @@ -4,8 +4,8 @@ package org.chromium.chrome.browser; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * This UncaughtExceptionHandler will create a breakpad minidump when there is an uncaught diff --git a/chrome/android/java/src/org/chromium/chrome/browser/JavascriptAppModalDialog.java b/chrome/android/java/src/org/chromium/chrome/browser/JavascriptAppModalDialog.java index 6c6193e..49a26b2 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/JavascriptAppModalDialog.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/JavascriptAppModalDialog.java @@ -16,8 +16,8 @@ import android.widget.CheckBox; import android.widget.EditText; import android.widget.TextView; -import org.chromium.base.CalledByNative; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.R; import org.chromium.ui.base.WindowAndroid; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/NavigationPopup.java b/chrome/android/java/src/org/chromium/chrome/browser/NavigationPopup.java index f7dd876..1e26c96 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/NavigationPopup.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/NavigationPopup.java @@ -21,8 +21,8 @@ import android.widget.ListPopupWindow; import android.widget.PopupWindow; import android.widget.TextView; -import org.chromium.base.CalledByNative; import org.chromium.base.ThreadUtils; +import org.chromium.base.annotations.CalledByNative; import org.chromium.content_public.browser.NavigationController; import org.chromium.content_public.browser.NavigationEntry; import org.chromium.content_public.browser.NavigationHistory; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/PasswordUIView.java b/chrome/android/java/src/org/chromium/chrome/browser/PasswordUIView.java index adfb14f..aeaa6e6 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/PasswordUIView.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/PasswordUIView.java @@ -4,8 +4,8 @@ package org.chromium.chrome.browser; -import org.chromium.base.CalledByNative; import org.chromium.base.ObserverList; +import org.chromium.base.annotations.CalledByNative; /** * Class for retrieving passwords and password exceptions (websites for which Chrome should not save diff --git a/chrome/android/java/src/org/chromium/chrome/browser/SSLClientCertificateRequest.java b/chrome/android/java/src/org/chromium/chrome/browser/SSLClientCertificateRequest.java index ce070a6..cc00f15 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/SSLClientCertificateRequest.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/SSLClientCertificateRequest.java @@ -12,9 +12,9 @@ import android.security.KeyChainAliasCallback; import android.security.KeyChainException; import android.util.Log; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.ThreadUtils; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.chrome.browser.smartcard.PKCS11AuthenticationManager; import org.chromium.net.AndroidPrivateKey; import org.chromium.net.DefaultAndroidKeyStore; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java index efdc48b..0724542 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java @@ -13,8 +13,8 @@ import android.util.Base64; import android.widget.Toast; import org.chromium.base.ApplicationStatus; -import org.chromium.base.CalledByNative; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.R; import org.chromium.chrome.browser.document.ChromeLauncherActivity; import org.chromium.chrome.browser.tab.Tab; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/SwipeRefreshHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/SwipeRefreshHandler.java index d62870e..ee14e00 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/SwipeRefreshHandler.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/SwipeRefreshHandler.java @@ -7,8 +7,8 @@ package org.chromium.chrome.browser; import android.content.Context; import android.view.ViewGroup.LayoutParams; -import org.chromium.base.JNINamespace; import org.chromium.base.TraceEvent; +import org.chromium.base.annotations.JNINamespace; import org.chromium.base.metrics.RecordUserAction; import org.chromium.chrome.R; import org.chromium.content.browser.ContentViewCore; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TtsPlatformImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/TtsPlatformImpl.java index f7c8731..0c4d114 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/TtsPlatformImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/TtsPlatformImpl.java @@ -9,9 +9,9 @@ import android.os.Build; import android.speech.tts.TextToSpeech; import android.speech.tts.UtteranceProgressListener; -import org.chromium.base.CalledByNative; import org.chromium.base.ThreadUtils; import org.chromium.base.TraceEvent; +import org.chromium.base.annotations.CalledByNative; import java.util.ArrayList; import java.util.HashMap; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java b/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java index 3984412..72c0c27 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java @@ -43,8 +43,8 @@ import android.widget.ScrollView; import android.widget.Spinner; import android.widget.TextView; -import org.chromium.base.CalledByNative; import org.chromium.base.CommandLine; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.R; import org.chromium.chrome.browser.omnibox.OmniboxUrlEmphasizer; import org.chromium.chrome.browser.preferences.PrefServiceBridge; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/FontSizePrefs.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/FontSizePrefs.java index 94e3b79..48a229a 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/FontSizePrefs.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/FontSizePrefs.java @@ -9,9 +9,9 @@ import android.content.SharedPreferences; import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.preference.PreferenceManager; -import org.chromium.base.CalledByNative; -import org.chromium.base.NativeCall; import org.chromium.base.ThreadUtils; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.NativeCall; import java.util.HashMap; import java.util.Map; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillDialogControllerAndroid.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillDialogControllerAndroid.java index 0ab793a..07017ba 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillDialogControllerAndroid.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillDialogControllerAndroid.java @@ -4,9 +4,9 @@ package org.chromium.chrome.browser.autofill; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.ui.base.WindowAndroid; /** diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillDialogResult.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillDialogResult.java index a5da29c..3f8be36 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillDialogResult.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillDialogResult.java @@ -4,9 +4,9 @@ package org.chromium.chrome.browser.autofill; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * Java-side result of a non-cancelled AutofillDialog invocation, and diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillKeyboardAccessoryBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillKeyboardAccessoryBridge.java index e1ff264..e0b1993 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillKeyboardAccessoryBridge.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillKeyboardAccessoryBridge.java @@ -4,8 +4,8 @@ package org.chromium.chrome.browser.autofill; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.chrome.browser.ResourceId; import org.chromium.ui.DropdownItem; import org.chromium.ui.autofill.AutofillKeyboardAccessory; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillLogger.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillLogger.java index d0f414b..d297f50 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillLogger.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillLogger.java @@ -4,9 +4,9 @@ package org.chromium.chrome.browser.autofill; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * JNI call glue for AutofillExternalDelagate C++ and Java objects. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillPopupBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillPopupBridge.java index 147f6a9..77428ce 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillPopupBridge.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillPopupBridge.java @@ -10,8 +10,8 @@ import android.content.DialogInterface; import android.os.Handler; import android.support.v7.app.AlertDialog; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.chrome.R; import org.chromium.chrome.browser.ResourceId; import org.chromium.ui.DropdownItem; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/CardUnmaskBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/CardUnmaskBridge.java index 78cc603..f39f750 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/CardUnmaskBridge.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/CardUnmaskBridge.java @@ -7,8 +7,8 @@ package org.chromium.chrome.browser.autofill; import android.app.Activity; import android.os.Handler; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.chrome.browser.ResourceId; import org.chromium.chrome.browser.autofill.CardUnmaskPrompt.CardUnmaskPromptDelegate; import org.chromium.ui.base.WindowAndroid; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/CreditCardScanner.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/CreditCardScanner.java index b03efca..0b79b97 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/CreditCardScanner.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/CreditCardScanner.java @@ -6,8 +6,8 @@ package org.chromium.chrome.browser.autofill; import android.content.Context; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.ui.base.WindowAndroid; /** diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/PasswordGenerationPopupBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/PasswordGenerationPopupBridge.java index 9703a00..aca6d9b 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/PasswordGenerationPopupBridge.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/PasswordGenerationPopupBridge.java @@ -10,8 +10,8 @@ import android.view.View; import android.widget.AdapterView; import android.widget.PopupWindow; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.ui.DropdownPopupWindow; import org.chromium.ui.R; import org.chromium.ui.base.ViewAndroidDelegate; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java index 70d7ebb..19abfe6 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java @@ -6,10 +6,10 @@ package org.chromium.chrome.browser.autofill; import android.content.Context; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.ThreadUtils; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.chrome.R; import java.util.ArrayList; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/banners/AppBannerManager.java b/chrome/android/java/src/org/chromium/chrome/browser/banners/AppBannerManager.java index 4d927f9..68370d20 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/banners/AppBannerManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/banners/AppBannerManager.java @@ -8,9 +8,9 @@ import android.content.Context; import android.text.TextUtils; import org.chromium.base.ApplicationStatus; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.chrome.R; import org.chromium.chrome.browser.BookmarkUtils; import org.chromium.chrome.browser.tab.EmptyTabObserver; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/childaccounts/ChildAccountFeedbackReporter.java b/chrome/android/java/src/org/chromium/chrome/browser/childaccounts/ChildAccountFeedbackReporter.java index 40ed349..22e929a 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/childaccounts/ChildAccountFeedbackReporter.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/childaccounts/ChildAccountFeedbackReporter.java @@ -6,8 +6,8 @@ package org.chromium.chrome.browser.childaccounts; import android.app.Activity; -import org.chromium.base.CalledByNative; import org.chromium.base.ThreadUtils; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.browser.ChromeApplication; import org.chromium.chrome.browser.feedback.FeedbackCollector; import org.chromium.chrome.browser.feedback.FeedbackReporter; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/childaccounts/ChildAccountService.java b/chrome/android/java/src/org/chromium/chrome/browser/childaccounts/ChildAccountService.java index 7568ca7..72bc738 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/childaccounts/ChildAccountService.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/childaccounts/ChildAccountService.java @@ -12,12 +12,12 @@ import android.accounts.OperationCanceledException; import android.content.Context; import android.content.Intent; -import org.chromium.base.CalledByNative; import org.chromium.base.CommandLine; import org.chromium.base.Log; import org.chromium.base.ThreadUtils; import org.chromium.base.TraceEvent; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.browser.ChromeSwitches; import org.chromium.chrome.browser.services.AccountsChangedReceiver; import org.chromium.chrome.browser.signin.SigninManager; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java index dfe923c..f28216f 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java @@ -15,12 +15,12 @@ import android.view.SurfaceHolder; import android.view.SurfaceView; import android.view.View; -import org.chromium.base.CalledByNative; import org.chromium.base.CommandLine; -import org.chromium.base.JNINamespace; import org.chromium.base.Log; import org.chromium.base.TraceEvent; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.chrome.R; import org.chromium.chrome.browser.ChromeSwitches; import org.chromium.chrome.browser.compositor.layouts.Layout; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/LayerTitleCache.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/LayerTitleCache.java index 32b869a..3d935b6 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/LayerTitleCache.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/LayerTitleCache.java @@ -9,8 +9,8 @@ import android.content.res.Resources; import android.graphics.Bitmap; import android.util.SparseArray; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.chrome.R; import org.chromium.ui.resources.ResourceManager; import org.chromium.ui.resources.dynamics.BitmapDynamicResource; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/content/TabContentManager.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/content/TabContentManager.java index 4b28492..08b720f 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/content/TabContentManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/content/TabContentManager.java @@ -10,10 +10,10 @@ import android.graphics.Canvas; import android.util.SparseArray; import android.view.View; -import org.chromium.base.CalledByNative; import org.chromium.base.CommandLine; -import org.chromium.base.JNINamespace; import org.chromium.base.PathUtils; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.chrome.R; import org.chromium.chrome.browser.ChromeSwitches; import org.chromium.chrome.browser.NativePage; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java index c253682..4bf9909 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java @@ -4,7 +4,7 @@ package org.chromium.chrome.browser.compositor.scene_layer; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.JNINamespace; import org.chromium.chrome.R; import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSearchPanel; import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSearchPanelFeatures; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ReaderModeSceneLayer.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ReaderModeSceneLayer.java index 1e8894c..a4a3009 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ReaderModeSceneLayer.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ReaderModeSceneLayer.java @@ -4,7 +4,7 @@ package org.chromium.chrome.browser.compositor.scene_layer; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.JNINamespace; import org.chromium.chrome.R; import org.chromium.chrome.browser.dom_distiller.ReaderModePanel; import org.chromium.content.browser.ContentViewCore; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/SceneLayer.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/SceneLayer.java index 84d8902..36ed61d 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/SceneLayer.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/SceneLayer.java @@ -4,8 +4,8 @@ package org.chromium.chrome.browser.compositor.scene_layer; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * Java representation of a scene layer. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/StaticTabSceneLayer.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/StaticTabSceneLayer.java index 44d2bb2..61660b7 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/StaticTabSceneLayer.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/StaticTabSceneLayer.java @@ -6,7 +6,7 @@ package org.chromium.chrome.browser.compositor.scene_layer; import android.graphics.Rect; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.JNINamespace; import org.chromium.chrome.browser.compositor.LayerTitleCache; import org.chromium.chrome.browser.compositor.layouts.components.LayoutTab; import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java index 721b7f9..7baceee 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java @@ -8,7 +8,7 @@ import android.content.Context; import android.content.res.Resources; import android.graphics.Rect; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.JNINamespace; import org.chromium.chrome.R; import org.chromium.chrome.browser.compositor.LayerTitleCache; import org.chromium.chrome.browser.compositor.layouts.Layout; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java index 96cb708..14341e1 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java @@ -6,7 +6,7 @@ package org.chromium.chrome.browser.compositor.scene_layer; import android.content.Context; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.JNINamespace; import org.chromium.chrome.browser.compositor.LayerTitleCache; import org.chromium.chrome.browser.compositor.layouts.components.CompositorButton; import org.chromium.chrome.browser.compositor.overlays.strip.StripLayoutHelperManager; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuHelper.java index a7021ed..c1fed82 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuHelper.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuHelper.java @@ -12,8 +12,8 @@ import android.view.MenuItem.OnMenuItemClickListener; import android.view.View; import android.view.View.OnCreateContextMenuListener; -import org.chromium.base.CalledByNative; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; import org.chromium.content.browser.ContentViewCore; /** diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuParams.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuParams.java index 96a2b47..509d7e0 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuParams.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuParams.java @@ -6,8 +6,8 @@ package org.chromium.chrome.browser.contextmenu; import android.text.TextUtils; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.content_public.common.Referrer; /** diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java index 99b02cd..c6ac64b 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java @@ -15,9 +15,9 @@ import android.view.ViewTreeObserver.OnGlobalFocusChangeListener; import org.chromium.base.ActivityState; import org.chromium.base.ApplicationStatus; import org.chromium.base.ApplicationStatus.ActivityStateListener; -import org.chromium.base.CalledByNative; import org.chromium.base.SysUtils; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.R; import org.chromium.chrome.browser.ChromeActivity; import org.chromium.chrome.browser.WebContentsFactory; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTabHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTabHelper.java index 8193564..19285e9 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTabHelper.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTabHelper.java @@ -4,7 +4,7 @@ package org.chromium.chrome.browser.contextualsearch; -import org.chromium.base.CalledByNative; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.browser.ChromeActivity; import org.chromium.chrome.browser.preferences.PrefServiceBridge; import org.chromium.chrome.browser.profiles.Profile; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/cookies/CookiesFetcher.java b/chrome/android/java/src/org/chromium/chrome/browser/cookies/CookiesFetcher.java index 0f72f68..c21ad0d 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/cookies/CookiesFetcher.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/cookies/CookiesFetcher.java @@ -8,9 +8,9 @@ import android.content.Context; import android.os.AsyncTask; import android.util.Log; -import org.chromium.base.CalledByNative; import org.chromium.base.ImportantFileWriterAndroid; import org.chromium.base.ThreadUtils; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.content.browser.crypto.CipherFactory; import org.chromium.content.common.CleanupReference; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/database/SQLiteCursor.java b/chrome/android/java/src/org/chromium/chrome/browser/database/SQLiteCursor.java index 46104cb..528e52a 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/database/SQLiteCursor.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/database/SQLiteCursor.java @@ -9,7 +9,7 @@ import android.database.AbstractCursor; import android.database.CursorWindow; import android.util.Log; -import org.chromium.base.CalledByNative; +import org.chromium.base.annotations.CalledByNative; import java.sql.Types; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/DomDistillerFeedbackReporter.java b/chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/DomDistillerFeedbackReporter.java index 9cce67f..94d0583 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/DomDistillerFeedbackReporter.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/DomDistillerFeedbackReporter.java @@ -6,9 +6,9 @@ package org.chromium.chrome.browser.dom_distiller; import android.app.Activity; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.ThreadUtils; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.chrome.browser.ChromeApplication; import org.chromium.chrome.browser.feedback.FeedbackCollector; import org.chromium.chrome.browser.feedback.FeedbackReporter; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/DomDistillerServiceFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/DomDistillerServiceFactory.java index f23095a..2ac2677 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/DomDistillerServiceFactory.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/DomDistillerServiceFactory.java @@ -4,8 +4,8 @@ package org.chromium.chrome.browser.dom_distiller; -import org.chromium.base.JNINamespace; import org.chromium.base.ThreadUtils; +import org.chromium.base.annotations.JNINamespace; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.components.dom_distiller.core.DomDistillerService; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/DomDistillerTabUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/DomDistillerTabUtils.java index 01660e3..f74c83e 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/DomDistillerTabUtils.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/DomDistillerTabUtils.java @@ -4,7 +4,7 @@ package org.chromium.chrome.browser.dom_distiller; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.JNINamespace; import org.chromium.content_public.browser.WebContents; /** diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/ChromeDownloadDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/download/ChromeDownloadDelegate.java index ac4fe0c..7a6ac10 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/download/ChromeDownloadDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/download/ChromeDownloadDelegate.java @@ -15,8 +15,8 @@ import android.webkit.MimeTypeMap; import android.webkit.URLUtil; import android.widget.Toast; -import org.chromium.base.CalledByNative; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.R; import org.chromium.chrome.browser.infobar.ConfirmInfoBar; import org.chromium.chrome.browser.infobar.InfoBar; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/favicon/FaviconHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/favicon/FaviconHelper.java index c562ada..1b35bc9 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/favicon/FaviconHelper.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/favicon/FaviconHelper.java @@ -7,7 +7,7 @@ package org.chromium.chrome.browser.favicon; import android.graphics.Bitmap; import android.graphics.Color; -import org.chromium.base.CalledByNative; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.browser.profiles.Profile; /** diff --git a/chrome/android/java/src/org/chromium/chrome/browser/favicon/LargeIconBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/favicon/LargeIconBridge.java index b8fb571..abbe47f2 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/favicon/LargeIconBridge.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/favicon/LargeIconBridge.java @@ -6,7 +6,7 @@ package org.chromium.chrome.browser.favicon; import android.graphics.Bitmap; -import org.chromium.base.CalledByNative; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.browser.profiles.Profile; /** diff --git a/chrome/android/java/src/org/chromium/chrome/browser/feedback/ConnectivityChecker.java b/chrome/android/java/src/org/chromium/chrome/browser/feedback/ConnectivityChecker.java index 69fd7a6..0817503 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/feedback/ConnectivityChecker.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/feedback/ConnectivityChecker.java @@ -6,11 +6,11 @@ package org.chromium.chrome.browser.feedback; import android.os.AsyncTask; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.Log; import org.chromium.base.ThreadUtils; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.chrome.browser.profiles.Profile; import java.io.IOException; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenInfoBarDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenInfoBarDelegate.java index 0352756..b4683ab 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenInfoBarDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenInfoBarDelegate.java @@ -4,7 +4,7 @@ package org.chromium.chrome.browser.fullscreen; -import org.chromium.base.CalledByNative; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.browser.preferences.website.ContentSetting; import org.chromium.chrome.browser.preferences.website.FullscreenInfo; import org.chromium.chrome.browser.tab.Tab; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/historyreport/HistoryReportJniBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/historyreport/HistoryReportJniBridge.java index c3a1f12..5b5b0d4 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/historyreport/HistoryReportJniBridge.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/historyreport/HistoryReportJniBridge.java @@ -6,11 +6,11 @@ package org.chromium.chrome.browser.historyreport; import android.text.TextUtils; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.Log; import org.chromium.base.ThreadUtils; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import java.io.PrintWriter; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/AccountChooserInfoBar.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/AccountChooserInfoBar.java index 874ce66..b091b93 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/AccountChooserInfoBar.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/AccountChooserInfoBar.java @@ -15,7 +15,7 @@ import android.widget.ImageView; import android.widget.ListView; import android.widget.TextView; -import org.chromium.base.CalledByNative; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.R; import org.chromium.chrome.browser.ResourceId; import org.chromium.chrome.browser.password_manager.Credential; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/AppBannerInfoBarAndroid.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/AppBannerInfoBarAndroid.java index 0476a2a..8e43220 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/AppBannerInfoBarAndroid.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/AppBannerInfoBarAndroid.java @@ -17,7 +17,7 @@ import android.widget.RatingBar; import android.widget.TextView; import org.chromium.base.ApplicationStatus; -import org.chromium.base.CalledByNative; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.R; import org.chromium.chrome.browser.banners.AppData; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/AppBannerInfoBarDelegateAndroid.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/AppBannerInfoBarDelegateAndroid.java index 199a029..83f237f 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/AppBannerInfoBarDelegateAndroid.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/AppBannerInfoBarDelegateAndroid.java @@ -12,9 +12,9 @@ import android.content.pm.PackageManager; import android.os.Looper; import org.chromium.base.ApplicationStatus; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.chrome.browser.banners.AppData; import org.chromium.chrome.browser.banners.InstallerDelegate; import org.chromium.chrome.browser.tab.Tab; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBarDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBarDelegate.java index d82b81c..5ca3708 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBarDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBarDelegate.java @@ -6,7 +6,7 @@ package org.chromium.chrome.browser.infobar; import android.graphics.Bitmap; -import org.chromium.base.CalledByNative; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.browser.ResourceId; import org.chromium.ui.base.WindowAndroid; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/DataReductionProxyInfoBarDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/DataReductionProxyInfoBarDelegate.java index ca54d0d..6e7178a 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/DataReductionProxyInfoBarDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/DataReductionProxyInfoBarDelegate.java @@ -4,7 +4,7 @@ package org.chromium.chrome.browser.infobar; -import org.chromium.base.CalledByNative; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.browser.ResourceId; import org.chromium.content_public.browser.WebContents; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/DownloadOverwriteInfoBar.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/DownloadOverwriteInfoBar.java index 5aa601f..2514602 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/DownloadOverwriteInfoBar.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/DownloadOverwriteInfoBar.java @@ -17,7 +17,7 @@ import android.text.style.ClickableSpan; import android.text.style.StyleSpan; import android.view.View; -import org.chromium.base.CalledByNative; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.R; import java.util.List; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/GeneratedPasswordSavedInfoBarDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/GeneratedPasswordSavedInfoBarDelegate.java index 6f0240b..f431602 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/GeneratedPasswordSavedInfoBarDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/GeneratedPasswordSavedInfoBarDelegate.java @@ -4,7 +4,7 @@ package org.chromium.chrome.browser.infobar; -import org.chromium.base.CalledByNative; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.browser.ResourceId; /** diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBar.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBar.java index 5395ad4..1e96d2d 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBar.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBar.java @@ -8,8 +8,8 @@ import android.content.Context; import android.graphics.Bitmap; import android.view.View; -import org.chromium.base.CalledByNative; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.R; /** diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarContainer.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarContainer.java index ecca12b..a6b302b 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarContainer.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarContainer.java @@ -14,9 +14,9 @@ import android.view.ViewGroup; import android.widget.FrameLayout; import android.widget.LinearLayout; -import org.chromium.base.CalledByNative; import org.chromium.base.ObserverList; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.R; import org.chromium.chrome.browser.banners.SwipableOverlayView; import org.chromium.chrome.browser.tab.Tab; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/PermissionUpdateInfoBarDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/PermissionUpdateInfoBarDelegate.java index 6f7913c..2dc7f58 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/PermissionUpdateInfoBarDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/PermissionUpdateInfoBarDelegate.java @@ -12,7 +12,7 @@ import android.provider.Settings; import org.chromium.base.ActivityState; import org.chromium.base.ApplicationStatus; import org.chromium.base.ApplicationStatus.ActivityStateListener; -import org.chromium.base.CalledByNative; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.browser.preferences.PrefServiceBridge; import org.chromium.content.browser.ContentViewCore; import org.chromium.content_public.browser.WebContents; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/SavePasswordInfoBar.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/SavePasswordInfoBar.java index 0cbcf09..f7828bc 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/SavePasswordInfoBar.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/SavePasswordInfoBar.java @@ -9,7 +9,7 @@ import android.text.Spanned; import android.text.style.ClickableSpan; import android.view.View; -import org.chromium.base.CalledByNative; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.browser.ResourceId; /** diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoBar.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoBar.java index 0c21639..cc44b86 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoBar.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoBar.java @@ -13,7 +13,7 @@ import android.text.style.ClickableSpan; import android.view.View; import android.widget.CheckBox; -import org.chromium.base.CalledByNative; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.R; import org.chromium.ui.base.DeviceFormFactor; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationServiceFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationServiceFactory.java index 8f2c051..5cafefd 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationServiceFactory.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationServiceFactory.java @@ -6,9 +6,9 @@ package org.chromium.chrome.browser.invalidation; import android.content.Context; -import org.chromium.base.JNINamespace; import org.chromium.base.ThreadUtils; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.JNINamespace; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.components.invalidation.InvalidationService; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/remote/RecordCastAction.java b/chrome/android/java/src/org/chromium/chrome/browser/media/remote/RecordCastAction.java index 7ee6c05..36c81ed 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/media/remote/RecordCastAction.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/media/remote/RecordCastAction.java @@ -4,7 +4,7 @@ package org.chromium.chrome.browser.media.remote; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.JNINamespace; import org.chromium.base.library_loader.LibraryLoader; /** diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/remote/RemoteMediaPlayerBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/media/remote/RemoteMediaPlayerBridge.java index aab587e..7598ff7 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/media/remote/RemoteMediaPlayerBridge.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/media/remote/RemoteMediaPlayerBridge.java @@ -12,9 +12,9 @@ import android.net.Uri; import android.os.Build; import android.util.Log; -import org.chromium.base.CalledByNative; import org.chromium.base.CommandLine; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.chrome.browser.ChromeSwitches; import org.chromium.chrome.browser.media.remote.RemoteVideoInfo.PlayerState; import org.chromium.media.MediaPlayerBridge; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java b/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java index 4829af4..a32b85f 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java @@ -6,7 +6,7 @@ package org.chromium.chrome.browser.metrics; import android.util.Pair; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.JNINamespace; import org.chromium.content_public.browser.WebContents; import java.util.ArrayList; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/metrics/UmaUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/metrics/UmaUtils.java index 5dc4d29..49db2a2 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/metrics/UmaUtils.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/metrics/UmaUtils.java @@ -4,7 +4,7 @@ package org.chromium.chrome.browser.metrics; -import org.chromium.base.CalledByNative; +import org.chromium.base.annotations.CalledByNative; /** * Utilities to support startup metrics - Android version. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java index 1d7b042..025d418 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java @@ -7,8 +7,8 @@ package org.chromium.chrome.browser.net.spdyproxy; import android.content.Context; import android.preference.PreferenceManager; -import org.chromium.base.CalledByNative; import org.chromium.base.ThreadUtils; +import org.chromium.base.annotations.CalledByNative; import java.text.NumberFormat; import java.util.Locale; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationUIManager.java b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationUIManager.java index d9c2103..dfe1988 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationUIManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationUIManager.java @@ -21,8 +21,8 @@ import android.text.TextUtils; import android.text.style.StyleSpan; import android.util.Log; -import org.chromium.base.CalledByNative; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.R; import org.chromium.chrome.browser.preferences.Preferences; import org.chromium.chrome.browser.preferences.PreferencesLauncher; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/ForeignSessionHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/ForeignSessionHelper.java index a6c3292..7a43e8e 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/ForeignSessionHelper.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/ForeignSessionHelper.java @@ -4,7 +4,7 @@ package org.chromium.chrome.browser.ntp; -import org.chromium.base.CalledByNative; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.tab.Tab; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/LogoBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/LogoBridge.java index 341e637..cf2937d 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/LogoBridge.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/LogoBridge.java @@ -6,7 +6,7 @@ package org.chromium.chrome.browser.ntp; import android.graphics.Bitmap; -import org.chromium.base.CalledByNative; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.browser.profiles.Profile; /** diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentlyClosedBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentlyClosedBridge.java index 3b06035..ed7b53d 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentlyClosedBridge.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentlyClosedBridge.java @@ -4,7 +4,7 @@ package org.chromium.chrome.browser.ntp; -import org.chromium.base.CalledByNative; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.tab.Tab; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offline_pages/OfflinePageBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/offline_pages/OfflinePageBridge.java index 34c51e1..accb2a1 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/offline_pages/OfflinePageBridge.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/offline_pages/OfflinePageBridge.java @@ -4,9 +4,9 @@ package org.chromium.chrome.browser.offline_pages; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.content_public.browser.WebContents; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/AnswersImage.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/AnswersImage.java index 958c256..93bb5ff 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/AnswersImage.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/AnswersImage.java @@ -6,7 +6,7 @@ package org.chromium.chrome.browser.omnibox; import android.graphics.Bitmap; -import org.chromium.base.CalledByNative; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.browser.profiles.Profile; /** diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/AutocompleteController.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/AutocompleteController.java index b1cef68..392968c 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/AutocompleteController.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/AutocompleteController.java @@ -7,8 +7,8 @@ package org.chromium.chrome.browser.omnibox; import android.os.Bundle; import android.text.TextUtils; -import org.chromium.base.CalledByNative; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.browser.omnibox.VoiceSuggestionProvider.VoiceResult; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.content_public.browser.WebContents; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/Credential.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/Credential.java index bb8c111..fdcbe82 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/Credential.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/Credential.java @@ -6,7 +6,7 @@ package org.chromium.chrome.browser.password_manager; import android.graphics.Bitmap; -import org.chromium.base.CalledByNative; +import org.chromium.base.annotations.CalledByNative; /** * Credential type which is used to represent credential which will be shown in account chooser diff --git a/chrome/android/java/src/org/chromium/chrome/browser/precache/PrecacheLauncher.java b/chrome/android/java/src/org/chromium/chrome/browser/precache/PrecacheLauncher.java index 7480c63..e0b8ee6 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/precache/PrecacheLauncher.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/precache/PrecacheLauncher.java @@ -6,8 +6,8 @@ package org.chromium.chrome.browser.precache; import android.content.Context; -import org.chromium.base.CalledByNative; import org.chromium.base.ThreadUtils; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.browser.preferences.privacy.PrivacyPreferencesManager; import java.util.concurrent.Callable; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/LocationSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/LocationSettings.java index 97ec095..6ecb123 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/LocationSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/LocationSettings.java @@ -11,9 +11,9 @@ import android.location.LocationManager; import android.provider.Settings; import org.chromium.base.ApplicationStatus; -import org.chromium.base.CalledByNative; import org.chromium.base.ThreadUtils; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; import org.chromium.base.annotations.SuppressFBWarnings; import org.chromium.chrome.browser.ChromeApplication; import org.chromium.content.browser.ContentViewCore; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java index 9d10123..6eb379e 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java @@ -10,8 +10,8 @@ import android.net.Uri; import android.preference.PreferenceManager; import android.util.Log; -import org.chromium.base.CalledByNative; import org.chromium.base.ThreadUtils; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.browser.ContentSettingsType; import org.chromium.chrome.browser.UrlUtilities; import org.chromium.chrome.browser.preferences.website.ContentSetting; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillProfileBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillProfileBridge.java index c6d17f8..755cb67 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillProfileBridge.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillProfileBridge.java @@ -6,8 +6,8 @@ package org.chromium.chrome.browser.preferences.autofill; import android.util.Pair; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import java.text.Collator; import java.util.ArrayList; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferenceBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferenceBridge.java index 19fde71..f4ebb54 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferenceBridge.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferenceBridge.java @@ -4,7 +4,7 @@ package org.chromium.chrome.browser.preferences.website; -import org.chromium.base.CalledByNative; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.browser.preferences.PrefServiceBridge; import java.util.ArrayList; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/prerender/ExternalPrerenderHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/prerender/ExternalPrerenderHandler.java index 0d2b569..da0067f 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/prerender/ExternalPrerenderHandler.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/prerender/ExternalPrerenderHandler.java @@ -4,7 +4,7 @@ package org.chromium.chrome.browser.prerender; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.JNINamespace; import org.chromium.chrome.browser.WebContentsFactory; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.content_public.browser.WebContents; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/profiles/MostVisitedSites.java b/chrome/android/java/src/org/chromium/chrome/browser/profiles/MostVisitedSites.java index fa5e88d..8e74742 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/profiles/MostVisitedSites.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/profiles/MostVisitedSites.java @@ -6,7 +6,7 @@ package org.chromium.chrome.browser.profiles; import android.graphics.Bitmap; -import org.chromium.base.CalledByNative; +import org.chromium.base.annotations.CalledByNative; /** * Methods to bridge into native history to provide most recent urls, titles and thumbnails. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/profiles/Profile.java b/chrome/android/java/src/org/chromium/chrome/browser/profiles/Profile.java index 908863a..af8783b 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/profiles/Profile.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/profiles/Profile.java @@ -7,8 +7,8 @@ package org.chromium.chrome.browser.profiles; import android.content.Context; import org.chromium.base.ApplicationStatus; -import org.chromium.base.CalledByNative; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.browser.cookies.CookiesFetcher; /** diff --git a/chrome/android/java/src/org/chromium/chrome/browser/profiles/ProfileDownloader.java b/chrome/android/java/src/org/chromium/chrome/browser/profiles/ProfileDownloader.java index 416e164..3b7c75f 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/profiles/ProfileDownloader.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/profiles/ProfileDownloader.java @@ -6,9 +6,9 @@ package org.chromium.chrome.browser.profiles; import android.graphics.Bitmap; -import org.chromium.base.CalledByNative; import org.chromium.base.ObserverList; import org.chromium.base.ThreadUtils; +import org.chromium.base.annotations.CalledByNative; /** * Android wrapper of the ProfileDownloader which provides access from the Java layer. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/rlz/RevenueStats.java b/chrome/android/java/src/org/chromium/chrome/browser/rlz/RevenueStats.java index 451d543..44f0898 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/rlz/RevenueStats.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/rlz/RevenueStats.java @@ -9,7 +9,7 @@ import android.content.SharedPreferences; import android.preference.PreferenceManager; import org.chromium.base.ApplicationStatus; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.JNINamespace; import org.chromium.chrome.browser.ChromeApplication; import org.chromium.chrome.browser.tab.Tab; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java b/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java index fec602f..b93931e 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java @@ -6,9 +6,9 @@ package org.chromium.chrome.browser.search_engines; import android.text.TextUtils; -import org.chromium.base.CalledByNative; import org.chromium.base.ObserverList; import org.chromium.base.ThreadUtils; +import org.chromium.base.annotations.CalledByNative; import java.util.ArrayList; import java.util.List; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementScreenHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementScreenHelper.java index 4383ddb..dc93b41 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementScreenHelper.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementScreenHelper.java @@ -8,8 +8,8 @@ import android.content.Context; import android.content.Intent; import android.provider.Settings; -import org.chromium.base.CalledByNative; import org.chromium.base.ThreadUtils; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.profiles.ProfileAccountManagementMetrics; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/OAuth2TokenService.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/OAuth2TokenService.java index 1392104..7f6737d 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/signin/OAuth2TokenService.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/OAuth2TokenService.java @@ -10,10 +10,10 @@ import android.content.Context; import android.preference.PreferenceManager; import android.util.Log; -import org.chromium.base.CalledByNative; import org.chromium.base.ObserverList; import org.chromium.base.ThreadUtils; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.sync.signin.AccountManagerHelper; import org.chromium.sync.signin.ChromeSigninController; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java index 9716e39..69eb235 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java @@ -19,10 +19,10 @@ import android.util.Log; import org.chromium.base.ActivityState; import org.chromium.base.ApplicationStatus; -import org.chromium.base.CalledByNative; import org.chromium.base.FieldTrialList; import org.chromium.base.ObserverList; import org.chromium.base.ThreadUtils; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.R; import org.chromium.chrome.browser.childaccounts.ChildAccountService; import org.chromium.chrome.browser.notifications.GoogleServicesNotificationController; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java index 81bb23e..56eaa07 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java @@ -11,9 +11,9 @@ import android.util.Log; import org.chromium.base.ActivityState; import org.chromium.base.ApplicationStatus; import org.chromium.base.ApplicationStatus.ActivityStateListener; -import org.chromium.base.CalledByNative; import org.chromium.base.ThreadUtils; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; import org.chromium.base.annotations.SuppressFBWarnings; import org.chromium.chrome.browser.identity.UniqueIdentificationGenerator; import org.chromium.sync.internal_api.pub.PassphraseType; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java index 87e46e3..0821ec3 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java @@ -21,11 +21,11 @@ import android.widget.FrameLayout; import org.chromium.base.ActivityState; import org.chromium.base.ApplicationState; import org.chromium.base.ApplicationStatus; -import org.chromium.base.CalledByNative; import org.chromium.base.ObserverList; import org.chromium.base.ObserverList.RewindableIterator; import org.chromium.base.TraceEvent; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; import org.chromium.base.metrics.RecordHistogram; import org.chromium.chrome.R; import org.chromium.chrome.browser.AccessibilityUtil; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelJniBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelJniBridge.java index e1968db..e128814 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelJniBridge.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelJniBridge.java @@ -6,7 +6,7 @@ package org.chromium.chrome.browser.tabmodel; import android.os.SystemClock; -import org.chromium.base.CalledByNative; +import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.tab.Tab; import org.chromium.content_public.browser.WebContents; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java index 6d1d591..1e2d156 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java @@ -4,7 +4,7 @@ package org.chromium.chrome.browser.toolbar; -import org.chromium.base.CalledByNative; +import org.chromium.base.annotations.CalledByNative; import org.chromium.content_public.browser.WebContents; /** diff --git a/chromecast/base/java/src/org/chromium/chromecast/base/ChromecastConfigAndroid.java b/chromecast/base/java/src/org/chromium/chromecast/base/ChromecastConfigAndroid.java index ba714db..1e65308 100644 --- a/chromecast/base/java/src/org/chromium/chromecast/base/ChromecastConfigAndroid.java +++ b/chromecast/base/java/src/org/chromium/chromecast/base/ChromecastConfigAndroid.java @@ -6,8 +6,8 @@ package org.chromium.chromecast.base; import android.content.Context; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * JNI wrapper class for calls from ChromecastConfigAndroid. diff --git a/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastCrashHandler.java b/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastCrashHandler.java index 3919e7c..0f2d662 100644 --- a/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastCrashHandler.java +++ b/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastCrashHandler.java @@ -6,9 +6,9 @@ package org.chromium.chromecast.shell; import android.content.Context; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.Log; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.chromecast.base.ChromecastConfigAndroid; /** diff --git a/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastMetricsHelper.java b/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastMetricsHelper.java index 600e4f8..8d8966f 100644 --- a/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastMetricsHelper.java +++ b/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastMetricsHelper.java @@ -4,7 +4,7 @@ package org.chromium.chromecast.shell; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.JNINamespace; /** * Wrapper of native CastMetricsHelper. diff --git a/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastSysInfoAndroid.java b/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastSysInfoAndroid.java index eaf7b07..01170fc 100644 --- a/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastSysInfoAndroid.java +++ b/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastSysInfoAndroid.java @@ -6,8 +6,8 @@ package org.chromium.chromecast.shell; import android.os.Build; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * Java implementation of CastSysInfoAndroid methods. diff --git a/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastWindowAndroid.java b/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastWindowAndroid.java index ed85dcf..70e043a 100644 --- a/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastWindowAndroid.java +++ b/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastWindowAndroid.java @@ -15,8 +15,8 @@ import android.view.ViewGroup; import android.widget.FrameLayout; import android.widget.LinearLayout; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.content.browser.ContentView; import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.ContentViewRenderView; diff --git a/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastWindowManager.java b/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastWindowManager.java index 3d3a4e8..acedf2f 100644 --- a/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastWindowManager.java +++ b/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastWindowManager.java @@ -10,8 +10,8 @@ import android.util.AttributeSet; import android.view.LayoutInflater; import android.widget.FrameLayout; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.ContentViewRenderView; import org.chromium.ui.base.WindowAndroid; diff --git a/components/bookmarks/common/android/java/src/org/chromium/components/bookmarks/BookmarkId.java b/components/bookmarks/common/android/java/src/org/chromium/components/bookmarks/BookmarkId.java index 683eaba..9dc1179 100644 --- a/components/bookmarks/common/android/java/src/org/chromium/components/bookmarks/BookmarkId.java +++ b/components/bookmarks/common/android/java/src/org/chromium/components/bookmarks/BookmarkId.java @@ -7,7 +7,7 @@ package org.chromium.components.bookmarks; import android.text.TextUtils; import android.util.Log; -import org.chromium.base.CalledByNative; +import org.chromium.base.annotations.CalledByNative; /** * Simple object representing the bookmark id. diff --git a/components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequest.java b/components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequest.java index 773e967..2e4fb6a 100644 --- a/components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequest.java +++ b/components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequest.java @@ -6,8 +6,8 @@ package org.chromium.net; import android.util.Log; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.base.annotations.SuppressFBWarnings; import java.io.IOException; diff --git a/components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequestContext.java b/components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequestContext.java index 688d034..2901071 100644 --- a/components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequestContext.java +++ b/components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequestContext.java @@ -10,8 +10,8 @@ import android.os.Looper; import android.os.Process; import android.util.Log; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * Provides context for the native HTTP operations. diff --git a/components/cronet/android/java/src/org/chromium/net/CronetHistogramManager.java b/components/cronet/android/java/src/org/chromium/net/CronetHistogramManager.java index cb2d8d4..e286291 100644 --- a/components/cronet/android/java/src/org/chromium/net/CronetHistogramManager.java +++ b/components/cronet/android/java/src/org/chromium/net/CronetHistogramManager.java @@ -4,7 +4,7 @@ package org.chromium.net; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.JNINamespace; /** * Controls UMA histograms. diff --git a/components/cronet/android/java/src/org/chromium/net/CronetLibraryLoader.java b/components/cronet/android/java/src/org/chromium/net/CronetLibraryLoader.java index 95e9559..9894ecd 100644 --- a/components/cronet/android/java/src/org/chromium/net/CronetLibraryLoader.java +++ b/components/cronet/android/java/src/org/chromium/net/CronetLibraryLoader.java @@ -8,7 +8,7 @@ import android.content.Context; import android.os.Handler; import android.os.Looper; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.JNINamespace; /** * CronetLibraryLoader loads and initializes native library on main thread. diff --git a/components/cronet/android/java/src/org/chromium/net/CronetUploadDataStream.java b/components/cronet/android/java/src/org/chromium/net/CronetUploadDataStream.java index e1c8689..13db48aa 100644 --- a/components/cronet/android/java/src/org/chromium/net/CronetUploadDataStream.java +++ b/components/cronet/android/java/src/org/chromium/net/CronetUploadDataStream.java @@ -4,9 +4,9 @@ package org.chromium.net; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; -import org.chromium.base.NativeClassQualifiedName; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; +import org.chromium.base.annotations.NativeClassQualifiedName; import java.nio.ByteBuffer; import java.util.concurrent.Executor; diff --git a/components/cronet/android/java/src/org/chromium/net/CronetUrlRequest.java b/components/cronet/android/java/src/org/chromium/net/CronetUrlRequest.java index 42136c0..7c6c1c3 100644 --- a/components/cronet/android/java/src/org/chromium/net/CronetUrlRequest.java +++ b/components/cronet/android/java/src/org/chromium/net/CronetUrlRequest.java @@ -7,10 +7,10 @@ package org.chromium.net; import android.util.Log; import android.util.Pair; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; -import org.chromium.base.NativeClassQualifiedName; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; +import org.chromium.base.annotations.NativeClassQualifiedName; import java.nio.ByteBuffer; import java.util.ArrayList; diff --git a/components/cronet/android/java/src/org/chromium/net/CronetUrlRequestContext.java b/components/cronet/android/java/src/org/chromium/net/CronetUrlRequestContext.java index 0192882..d2bdf60 100644 --- a/components/cronet/android/java/src/org/chromium/net/CronetUrlRequestContext.java +++ b/components/cronet/android/java/src/org/chromium/net/CronetUrlRequestContext.java @@ -12,10 +12,10 @@ import android.os.Looper; import android.os.Process; import android.util.Log; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; -import org.chromium.base.NativeClassQualifiedName; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; +import org.chromium.base.annotations.NativeClassQualifiedName; import org.chromium.base.annotations.UsedByReflection; import java.util.concurrent.Executor; diff --git a/components/cronet/android/proguard.cfg b/components/cronet/android/proguard.cfg index 196bd26..52a3a59 100644 --- a/components/cronet/android/proguard.cfg +++ b/components/cronet/android/proguard.cfg @@ -1,11 +1,11 @@ # Keep annotations used by chromium to keep members referenced by native code --keep class org.chromium.base.*Native* --keep class org.chromium.base.JNINamespace +-keep class org.chromium.base.annotations.*Native* +-keep class org.chromium.base.annotations.JNINamespace -keepclasseswithmembers class org.chromium.** { @org.chromium.base.annotations.AccessedByNative <fields>; } -keepclasseswithmembers class org.chromium.** { - @org.chromium.base.*Native* <methods>; + @org.chromium.base.annotations.*Native* <methods>; } # TODO(mef) remove unnecessary classes from base, so we don't have to preserve diff --git a/components/cronet/android/test/src/org/chromium/net/CronetTestUtil.java b/components/cronet/android/test/src/org/chromium/net/CronetTestUtil.java index 652b571..745d10a 100644 --- a/components/cronet/android/test/src/org/chromium/net/CronetTestUtil.java +++ b/components/cronet/android/test/src/org/chromium/net/CronetTestUtil.java @@ -4,7 +4,7 @@ package org.chromium.net; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.JNINamespace; /** * Utilities for Cronet testing diff --git a/components/cronet/android/test/src/org/chromium/net/MockUrlRequestJobFactory.java b/components/cronet/android/test/src/org/chromium/net/MockUrlRequestJobFactory.java index 70f837b..505db12 100644 --- a/components/cronet/android/test/src/org/chromium/net/MockUrlRequestJobFactory.java +++ b/components/cronet/android/test/src/org/chromium/net/MockUrlRequestJobFactory.java @@ -6,7 +6,7 @@ package org.chromium.net; import static junit.framework.Assert.assertTrue; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.JNINamespace; import org.chromium.net.test.FailurePhase; /** diff --git a/components/cronet/android/test/src/org/chromium/net/NativeTestServer.java b/components/cronet/android/test/src/org/chromium/net/NativeTestServer.java index d87dbc8b..c6f3efe 100644 --- a/components/cronet/android/test/src/org/chromium/net/NativeTestServer.java +++ b/components/cronet/android/test/src/org/chromium/net/NativeTestServer.java @@ -7,8 +7,8 @@ package org.chromium.net; import android.content.Context; import android.os.ConditionVariable; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * Wrapper class to start an in-process native test server, and get URLs diff --git a/components/cronet/android/test/src/org/chromium/net/NetworkChangeNotifierUtil.java b/components/cronet/android/test/src/org/chromium/net/NetworkChangeNotifierUtil.java index 70be134..1598f84 100644 --- a/components/cronet/android/test/src/org/chromium/net/NetworkChangeNotifierUtil.java +++ b/components/cronet/android/test/src/org/chromium/net/NetworkChangeNotifierUtil.java @@ -4,7 +4,7 @@ package org.chromium.net; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.JNINamespace; /** * Wrapper class that contains utility methods to test network change notifier. diff --git a/components/cronet/android/test/src/org/chromium/net/QuicTestServer.java b/components/cronet/android/test/src/org/chromium/net/QuicTestServer.java index a7b3ebd..7ab75d8 100644 --- a/components/cronet/android/test/src/org/chromium/net/QuicTestServer.java +++ b/components/cronet/android/test/src/org/chromium/net/QuicTestServer.java @@ -7,9 +7,9 @@ package org.chromium.net; import android.content.Context; import android.os.ConditionVariable; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.Log; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * Wrapper class to start a Quic test server. diff --git a/components/cronet/android/test/src/org/chromium/net/SdchObserver.java b/components/cronet/android/test/src/org/chromium/net/SdchObserver.java index f3a0f05..1d55cd7 100644 --- a/components/cronet/android/test/src/org/chromium/net/SdchObserver.java +++ b/components/cronet/android/test/src/org/chromium/net/SdchObserver.java @@ -6,8 +6,8 @@ package org.chromium.net; import android.os.ConditionVariable; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * Class to watch for Sdch dictionary events. The native implementation diff --git a/components/cronet/android/test/src/org/chromium/net/TestUploadDataStreamHandler.java b/components/cronet/android/test/src/org/chromium/net/TestUploadDataStreamHandler.java index 2179515..0d2e610 100644 --- a/components/cronet/android/test/src/org/chromium/net/TestUploadDataStreamHandler.java +++ b/components/cronet/android/test/src/org/chromium/net/TestUploadDataStreamHandler.java @@ -8,9 +8,9 @@ import android.os.ConditionVariable; import junit.framework.Assert; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; -import org.chromium.base.NativeClassQualifiedName; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; +import org.chromium.base.annotations.NativeClassQualifiedName; /** * A wrapper class on top of the native net::UploadDataStream. This class is diff --git a/components/dom_distiller/android/java/src/org/chromium/components/dom_distiller/content/DistillablePageUtils.java b/components/dom_distiller/android/java/src/org/chromium/components/dom_distiller/content/DistillablePageUtils.java index 39c4ba1..0f7c794 100644 --- a/components/dom_distiller/android/java/src/org/chromium/components/dom_distiller/content/DistillablePageUtils.java +++ b/components/dom_distiller/android/java/src/org/chromium/components/dom_distiller/content/DistillablePageUtils.java @@ -4,8 +4,8 @@ package org.chromium.components.dom_distiller.content; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.content_public.browser.WebContents; /** diff --git a/components/dom_distiller/android/java/src/org/chromium/components/dom_distiller/core/DistilledPagePrefs.java b/components/dom_distiller/android/java/src/org/chromium/components/dom_distiller/core/DistilledPagePrefs.java index 2f249d0..8a44865 100644 --- a/components/dom_distiller/android/java/src/org/chromium/components/dom_distiller/core/DistilledPagePrefs.java +++ b/components/dom_distiller/android/java/src/org/chromium/components/dom_distiller/core/DistilledPagePrefs.java @@ -4,9 +4,9 @@ package org.chromium.components.dom_distiller.core; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; -import org.chromium.base.NativeCall; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; +import org.chromium.base.annotations.NativeCall; import java.util.HashMap; import java.util.Map; diff --git a/components/dom_distiller/android/java/src/org/chromium/components/dom_distiller/core/DomDistillerService.java b/components/dom_distiller/android/java/src/org/chromium/components/dom_distiller/core/DomDistillerService.java index 8e4ec4b..80ec53f 100644 --- a/components/dom_distiller/android/java/src/org/chromium/components/dom_distiller/core/DomDistillerService.java +++ b/components/dom_distiller/android/java/src/org/chromium/components/dom_distiller/core/DomDistillerService.java @@ -4,9 +4,9 @@ package org.chromium.components.dom_distiller.core; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.ThreadUtils; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * Wrapper for native dom_distiller::DomDistillerService. diff --git a/components/dom_distiller/android/java/src/org/chromium/components/dom_distiller/core/DomDistillerUrlUtils.java b/components/dom_distiller/android/java/src/org/chromium/components/dom_distiller/core/DomDistillerUrlUtils.java index 11ab129..98229f1 100644 --- a/components/dom_distiller/android/java/src/org/chromium/components/dom_distiller/core/DomDistillerUrlUtils.java +++ b/components/dom_distiller/android/java/src/org/chromium/components/dom_distiller/core/DomDistillerUrlUtils.java @@ -6,8 +6,8 @@ package org.chromium.components.dom_distiller.core; import android.text.TextUtils; -import org.chromium.base.JNINamespace; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.JNINamespace; /** * Wrapper for the dom_distiller::url_utils. diff --git a/components/external_video_surface/android/java/src/org/chromium/components/external_video_surface/ExternalVideoSurfaceContainer.java b/components/external_video_surface/android/java/src/org/chromium/components/external_video_surface/ExternalVideoSurfaceContainer.java index baa2a69..739252f 100644 --- a/components/external_video_surface/android/java/src/org/chromium/components/external_video_surface/ExternalVideoSurfaceContainer.java +++ b/components/external_video_surface/android/java/src/org/chromium/components/external_video_surface/ExternalVideoSurfaceContainer.java @@ -11,9 +11,9 @@ import android.view.SurfaceHolder; import android.view.SurfaceView; import android.view.ViewGroup; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.content.browser.ContainerViewObserver; import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.RenderCoordinates; diff --git a/components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/GCMDriver.java b/components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/GCMDriver.java index e22d51e..7cb0d6d 100644 --- a/components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/GCMDriver.java +++ b/components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/GCMDriver.java @@ -9,9 +9,9 @@ import android.os.AsyncTask; import android.os.Bundle; import android.util.Log; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.ThreadUtils; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.base.library_loader.LibraryProcessType; import org.chromium.base.library_loader.ProcessInitException; import org.chromium.content.app.ContentApplication; diff --git a/components/invalidation/impl/android/java/src/org/chromium/components/invalidation/InvalidationService.java b/components/invalidation/impl/android/java/src/org/chromium/components/invalidation/InvalidationService.java index 96963ad..74557c0 100644 --- a/components/invalidation/impl/android/java/src/org/chromium/components/invalidation/InvalidationService.java +++ b/components/invalidation/impl/android/java/src/org/chromium/components/invalidation/InvalidationService.java @@ -10,10 +10,10 @@ import android.content.Intent; import com.google.protos.ipc.invalidation.Types; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.ThreadUtils; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.sync.notifier.InvalidationClientNameProvider; import org.chromium.sync.notifier.InvalidationIntentProtocol; import org.chromium.sync.notifier.InvalidationPreferences; diff --git a/components/navigation_interception/android/java/src/org/chromium/components/navigation_interception/InterceptNavigationDelegate.java b/components/navigation_interception/android/java/src/org/chromium/components/navigation_interception/InterceptNavigationDelegate.java index c9ab339..cff07ae 100644 --- a/components/navigation_interception/android/java/src/org/chromium/components/navigation_interception/InterceptNavigationDelegate.java +++ b/components/navigation_interception/android/java/src/org/chromium/components/navigation_interception/InterceptNavigationDelegate.java @@ -4,7 +4,7 @@ package org.chromium.components.navigation_interception; -import org.chromium.base.CalledByNative; +import org.chromium.base.annotations.CalledByNative; public interface InterceptNavigationDelegate { diff --git a/components/navigation_interception/android/java/src/org/chromium/components/navigation_interception/NavigationParams.java b/components/navigation_interception/android/java/src/org/chromium/components/navigation_interception/NavigationParams.java index 37fb64c..d6e14f9 100644 --- a/components/navigation_interception/android/java/src/org/chromium/components/navigation_interception/NavigationParams.java +++ b/components/navigation_interception/android/java/src/org/chromium/components/navigation_interception/NavigationParams.java @@ -6,7 +6,7 @@ package org.chromium.components.navigation_interception; import android.text.TextUtils; -import org.chromium.base.CalledByNative; +import org.chromium.base.annotations.CalledByNative; /** * Navigation parameters container used to keep parameters for navigation interception. diff --git a/components/policy/android/java/src/org/chromium/policy/CombinedPolicyProvider.java b/components/policy/android/java/src/org/chromium/policy/CombinedPolicyProvider.java index 4518037..601d64f 100644 --- a/components/policy/android/java/src/org/chromium/policy/CombinedPolicyProvider.java +++ b/components/policy/android/java/src/org/chromium/policy/CombinedPolicyProvider.java @@ -6,10 +6,10 @@ package org.chromium.policy; import android.os.Bundle; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.ThreadUtils; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import java.util.ArrayList; import java.util.List; diff --git a/components/policy/android/java/src/org/chromium/policy/PolicyConverter.java b/components/policy/android/java/src/org/chromium/policy/PolicyConverter.java index 4d4835b8..7c3a5f9 100644 --- a/components/policy/android/java/src/org/chromium/policy/PolicyConverter.java +++ b/components/policy/android/java/src/org/chromium/policy/PolicyConverter.java @@ -4,8 +4,8 @@ package org.chromium.policy; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * Allows converting Java policies, contained as key/value pairs in {@link android.os.Bundle}s to diff --git a/components/resource_provider/android/java/org/chromium/resource_provider/Main.java b/components/resource_provider/android/java/org/chromium/resource_provider/Main.java index 589aa7a..6395262 100644 --- a/components/resource_provider/android/java/org/chromium/resource_provider/Main.java +++ b/components/resource_provider/android/java/org/chromium/resource_provider/Main.java @@ -6,9 +6,9 @@ package org.chromium.resource_provider; import android.content.Context; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.PathUtils; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * This class does setup for resource_provider. diff --git a/components/safe_json/android/java/src/org/chromium/components/safejson/JsonSanitizer.java b/components/safe_json/android/java/src/org/chromium/components/safejson/JsonSanitizer.java index 1fae2fd..cb86408 100644 --- a/components/safe_json/android/java/src/org/chromium/components/safejson/JsonSanitizer.java +++ b/components/safe_json/android/java/src/org/chromium/components/safejson/JsonSanitizer.java @@ -9,9 +9,9 @@ import android.util.JsonToken; import android.util.JsonWriter; import android.util.MalformedJsonException; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.StreamUtil; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import java.io.IOException; import java.io.StringReader; diff --git a/components/service_tab_launcher/android/java/src/org/chromium/components/service_tab_launcher/ServiceTabLauncher.java b/components/service_tab_launcher/android/java/src/org/chromium/components/service_tab_launcher/ServiceTabLauncher.java index f782044..f684748 100644 --- a/components/service_tab_launcher/android/java/src/org/chromium/components/service_tab_launcher/ServiceTabLauncher.java +++ b/components/service_tab_launcher/android/java/src/org/chromium/components/service_tab_launcher/ServiceTabLauncher.java @@ -10,7 +10,7 @@ import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.util.Log; -import org.chromium.base.CalledByNative; +import org.chromium.base.annotations.CalledByNative; import org.chromium.content_public.browser.WebContents; /** diff --git a/components/signin/core/browser/android/java/src/org/chromium/components/signin/ChildAccountInfoFetcher.java b/components/signin/core/browser/android/java/src/org/chromium/components/signin/ChildAccountInfoFetcher.java index 34f8a56..3dfc915 100644 --- a/components/signin/core/browser/android/java/src/org/chromium/components/signin/ChildAccountInfoFetcher.java +++ b/components/signin/core/browser/android/java/src/org/chromium/components/signin/ChildAccountInfoFetcher.java @@ -12,8 +12,8 @@ import android.accounts.OperationCanceledException; import android.content.Context; import org.chromium.base.ApplicationStatus; -import org.chromium.base.CalledByNative; import org.chromium.base.Log; +import org.chromium.base.annotations.CalledByNative; import org.chromium.sync.signin.AccountManagerHelper; import java.io.IOException; diff --git a/components/variations/android/java/src/org/chromium/components/variations/VariationsAssociatedData.java b/components/variations/android/java/src/org/chromium/components/variations/VariationsAssociatedData.java index 34353da..4a49a92 100644 --- a/components/variations/android/java/src/org/chromium/components/variations/VariationsAssociatedData.java +++ b/components/variations/android/java/src/org/chromium/components/variations/VariationsAssociatedData.java @@ -4,7 +4,7 @@ package org.chromium.components.variations; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.JNINamespace; /** * Wrapper for variations. diff --git a/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java index c1fe69c..207fee2 100644 --- a/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java +++ b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java @@ -6,8 +6,8 @@ package org.chromium.components.web_contents_delegate_android; import android.content.Context; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.content.browser.ContentViewCore; import org.chromium.ui.ColorPickerDialog; import org.chromium.ui.ColorSuggestion; diff --git a/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ValidationMessageBubble.java b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ValidationMessageBubble.java index 9b6d7a3..d2c0f31 100644 --- a/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ValidationMessageBubble.java +++ b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ValidationMessageBubble.java @@ -15,7 +15,7 @@ import android.widget.RelativeLayout; import android.widget.TextView; import org.chromium.base.ApiCompatibilityUtils; -import org.chromium.base.CalledByNative; +import org.chromium.base.annotations.CalledByNative; import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.RenderCoordinates; @@ -134,8 +134,8 @@ class ValidationMessageBubble { final View root = mPopup.getContentView(); final int width = root.getMeasuredWidth(); final int arrowWidth = root.findViewById(R.id.arrow_image).getMeasuredWidth(); - return ApiCompatibilityUtils.isLayoutRtl(root) ? - (width * 3 / 4 - arrowWidth / 2) : (width / 4 + arrowWidth / 2); + return ApiCompatibilityUtils.isLayoutRtl(root) + ? (width * 3 / 4 - arrowWidth / 2) : (width / 4 + arrowWidth / 2); } /** @@ -144,8 +144,8 @@ class ValidationMessageBubble { private Point adjustWindowPosition(ContentViewCore contentViewCore, int x, int y) { final RenderCoordinates coordinates = contentViewCore.getRenderCoordinates(); final int viewWidth = coordinates.getLastFrameViewportWidthPixInt(); - final int viewBottom = (int) getWebViewOffsetYPixInScreen(contentViewCore) + - coordinates.getLastFrameViewportHeightPixInt(); + final int viewBottom = (int) getWebViewOffsetYPixInScreen(contentViewCore) + + coordinates.getLastFrameViewportHeightPixInt(); final int width = mPopup.getContentView().getMeasuredWidth(); final int height = mPopup.getContentView().getMeasuredHeight(); if (x < 0) { diff --git a/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/WebContentsDelegateAndroid.java b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/WebContentsDelegateAndroid.java index b122f98..da02731 100644 --- a/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/WebContentsDelegateAndroid.java +++ b/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/WebContentsDelegateAndroid.java @@ -6,8 +6,8 @@ package org.chromium.components.web_contents_delegate_android; import android.view.KeyEvent; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.content_public.browser.WebContents; /** diff --git a/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java b/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java index a02e640..95c274d 100644 --- a/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java +++ b/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java @@ -16,10 +16,10 @@ import android.os.RemoteException; import android.view.Surface; import org.chromium.base.BaseSwitches; -import org.chromium.base.CalledByNative; import org.chromium.base.CommandLine; -import org.chromium.base.JNINamespace; import org.chromium.base.Log; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.base.annotations.SuppressFBWarnings; import org.chromium.base.library_loader.LibraryLoader; import org.chromium.base.library_loader.LibraryProcessType; diff --git a/content/public/android/java/src/org/chromium/content/app/ContentMain.java b/content/public/android/java/src/org/chromium/content/app/ContentMain.java index 9fe23e1..7c542d5 100644 --- a/content/public/android/java/src/org/chromium/content/app/ContentMain.java +++ b/content/public/android/java/src/org/chromium/content/app/ContentMain.java @@ -6,7 +6,7 @@ package org.chromium.content.app; import android.content.Context; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.JNINamespace; /** * This class is used to initialize all types of process. It corresponds to diff --git a/content/public/android/java/src/org/chromium/content/browser/BackgroundSyncLauncher.java b/content/public/android/java/src/org/chromium/content/browser/BackgroundSyncLauncher.java index 9da674d..626753c 100644 --- a/content/public/android/java/src/org/chromium/content/browser/BackgroundSyncLauncher.java +++ b/content/public/android/java/src/org/chromium/content/browser/BackgroundSyncLauncher.java @@ -8,9 +8,9 @@ import android.content.Context; import android.content.SharedPreferences; import android.preference.PreferenceManager; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * The {@link BackgroundSyncLauncher} singleton is created and owned by the C++ browser. It diff --git a/content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java b/content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java index f533615..4bc3154 100644 --- a/content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java +++ b/content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java @@ -7,12 +7,12 @@ package org.chromium.content.browser; import android.content.Context; import android.os.Handler; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.Log; import org.chromium.base.ResourceExtractor; import org.chromium.base.ThreadUtils; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.base.library_loader.LibraryLoader; import org.chromium.base.library_loader.LibraryProcessType; import org.chromium.base.library_loader.LoaderErrors; diff --git a/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java b/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java index 580c781..efac891 100644 --- a/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java +++ b/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java @@ -13,12 +13,12 @@ import android.os.RemoteException; import android.util.Pair; import android.view.Surface; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.Log; import org.chromium.base.ThreadUtils; import org.chromium.base.TraceEvent; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.base.library_loader.Linker; import org.chromium.content.app.ChildProcessService; import org.chromium.content.app.ChromiumLinkerParams; diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentReadbackHandler.java b/content/public/android/java/src/org/chromium/content/browser/ContentReadbackHandler.java index 9b63009..6bfae67 100644 --- a/content/public/android/java/src/org/chromium/content/browser/ContentReadbackHandler.java +++ b/content/public/android/java/src/org/chromium/content/browser/ContentReadbackHandler.java @@ -8,9 +8,9 @@ import android.graphics.Bitmap; import android.graphics.Rect; import android.util.SparseArray; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.ThreadUtils; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.content_public.browser.readback_types.ReadbackResponse; import org.chromium.ui.base.WindowAndroid; diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java b/content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java index 3639191..821208c 100644 --- a/content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java +++ b/content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java @@ -23,10 +23,10 @@ import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.Log; import org.chromium.base.ThreadUtils; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * This class implements accelerated fullscreen video playback using surface view. diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java index 7a3bded..57ab809 100644 --- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java +++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java @@ -45,14 +45,14 @@ import android.view.inputmethod.InputMethodManager; import android.widget.FrameLayout; import org.chromium.base.ApiCompatibilityUtils; -import org.chromium.base.CalledByNative; import org.chromium.base.CommandLine; -import org.chromium.base.JNINamespace; import org.chromium.base.Log; import org.chromium.base.ObserverList; import org.chromium.base.ObserverList.RewindableIterator; import org.chromium.base.TraceEvent; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.content.R; import org.chromium.content.browser.ScreenOrientationListener.ScreenOrientationObserver; import org.chromium.content.browser.accessibility.BrowserAccessibilityManager; diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewRenderView.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewRenderView.java index 950ea3b..0381044 100644 --- a/content/public/android/java/src/org/chromium/content/browser/ContentViewRenderView.java +++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewRenderView.java @@ -12,8 +12,8 @@ import android.view.SurfaceHolder; import android.view.SurfaceView; import android.widget.FrameLayout; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.ui.base.WindowAndroid; /*** diff --git a/content/public/android/java/src/org/chromium/content/browser/DeviceSensors.java b/content/public/android/java/src/org/chromium/content/browser/DeviceSensors.java index f64c64f..1833bab 100644 --- a/content/public/android/java/src/org/chromium/content/browser/DeviceSensors.java +++ b/content/public/android/java/src/org/chromium/content/browser/DeviceSensors.java @@ -12,12 +12,12 @@ import android.hardware.SensorManager; import android.os.Handler; import android.os.HandlerThread; -import org.chromium.base.CalledByNative; import org.chromium.base.CollectionUtil; -import org.chromium.base.JNINamespace; import org.chromium.base.Log; import org.chromium.base.ThreadUtils; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import java.util.HashSet; import java.util.List; diff --git a/content/public/android/java/src/org/chromium/content/browser/DownloadController.java b/content/public/android/java/src/org/chromium/content/browser/DownloadController.java index e16933f..82e4bee 100644 --- a/content/public/android/java/src/org/chromium/content/browser/DownloadController.java +++ b/content/public/android/java/src/org/chromium/content/browser/DownloadController.java @@ -6,8 +6,8 @@ package org.chromium.content.browser; import android.content.Context; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.ui.base.WindowAndroid.FileAccessCallback; /** diff --git a/content/public/android/java/src/org/chromium/content/browser/InterstitialPageDelegateAndroid.java b/content/public/android/java/src/org/chromium/content/browser/InterstitialPageDelegateAndroid.java index 0b3173a..9af0cd5 100644 --- a/content/public/android/java/src/org/chromium/content/browser/InterstitialPageDelegateAndroid.java +++ b/content/public/android/java/src/org/chromium/content/browser/InterstitialPageDelegateAndroid.java @@ -4,9 +4,9 @@ package org.chromium.content.browser; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * Allows the specification and handling of Interstitial pages in java. diff --git a/content/public/android/java/src/org/chromium/content/browser/LocationProviderAdapter.java b/content/public/android/java/src/org/chromium/content/browser/LocationProviderAdapter.java index 2d79b4b..9d83104 100644 --- a/content/public/android/java/src/org/chromium/content/browser/LocationProviderAdapter.java +++ b/content/public/android/java/src/org/chromium/content/browser/LocationProviderAdapter.java @@ -6,9 +6,9 @@ package org.chromium.content.browser; import android.content.Context; -import org.chromium.base.CalledByNative; import org.chromium.base.ThreadUtils; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; import java.util.concurrent.FutureTask; diff --git a/content/public/android/java/src/org/chromium/content/browser/MediaDrmCredentialManager.java b/content/public/android/java/src/org/chromium/content/browser/MediaDrmCredentialManager.java index d5a491d..6e3ab7a 100644 --- a/content/public/android/java/src/org/chromium/content/browser/MediaDrmCredentialManager.java +++ b/content/public/android/java/src/org/chromium/content/browser/MediaDrmCredentialManager.java @@ -4,8 +4,8 @@ package org.chromium.content.browser; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * A wrapper of the android MediaDrmCredentialManager diff --git a/content/public/android/java/src/org/chromium/content/browser/MediaResourceGetter.java b/content/public/android/java/src/org/chromium/content/browser/MediaResourceGetter.java index b81e87f..f7b7cd3 100644 --- a/content/public/android/java/src/org/chromium/content/browser/MediaResourceGetter.java +++ b/content/public/android/java/src/org/chromium/content/browser/MediaResourceGetter.java @@ -13,11 +13,11 @@ import android.net.NetworkInfo; import android.os.ParcelFileDescriptor; import android.text.TextUtils; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.Log; import org.chromium.base.PathUtils; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import java.io.File; import java.io.IOException; diff --git a/content/public/android/java/src/org/chromium/content/browser/MediaSession.java b/content/public/android/java/src/org/chromium/content/browser/MediaSession.java index 17db4ec..69ac3c5 100644 --- a/content/public/android/java/src/org/chromium/content/browser/MediaSession.java +++ b/content/public/android/java/src/org/chromium/content/browser/MediaSession.java @@ -7,9 +7,9 @@ package org.chromium.content.browser; import android.content.Context; import android.media.AudioManager; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.Log; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * MediaSession is the Java counterpart of content::MediaSession. diff --git a/content/public/android/java/src/org/chromium/content/browser/MotionEventSynthesizer.java b/content/public/android/java/src/org/chromium/content/browser/MotionEventSynthesizer.java index 3616375..355bd48 100644 --- a/content/public/android/java/src/org/chromium/content/browser/MotionEventSynthesizer.java +++ b/content/public/android/java/src/org/chromium/content/browser/MotionEventSynthesizer.java @@ -9,8 +9,8 @@ import android.view.MotionEvent; import android.view.MotionEvent.PointerCoords; import android.view.MotionEvent.PointerProperties; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * Provides a Java-side implementation for injecting synthetic touch events. diff --git a/content/public/android/java/src/org/chromium/content/browser/PowerSaveBlocker.java b/content/public/android/java/src/org/chromium/content/browser/PowerSaveBlocker.java index 4eea4c0..da9aa9c 100644 --- a/content/public/android/java/src/org/chromium/content/browser/PowerSaveBlocker.java +++ b/content/public/android/java/src/org/chromium/content/browser/PowerSaveBlocker.java @@ -6,8 +6,8 @@ package org.chromium.content.browser; import android.view.View; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.ui.base.ViewAndroidDelegate; import java.lang.ref.WeakReference; diff --git a/content/public/android/java/src/org/chromium/content/browser/ScreenOrientationProvider.java b/content/public/android/java/src/org/chromium/content/browser/ScreenOrientationProvider.java index c99bc9a..f501322 100644 --- a/content/public/android/java/src/org/chromium/content/browser/ScreenOrientationProvider.java +++ b/content/public/android/java/src/org/chromium/content/browser/ScreenOrientationProvider.java @@ -9,10 +9,10 @@ import android.content.pm.ActivityInfo; import android.content.pm.PackageManager; import org.chromium.base.ApplicationStatus; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.Log; import org.chromium.base.ThreadUtils; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.content_public.common.ScreenOrientationConstants; import org.chromium.content_public.common.ScreenOrientationValues; import org.chromium.ui.gfx.DeviceDisplayInfo; diff --git a/content/public/android/java/src/org/chromium/content/browser/ServiceRegistrar.java b/content/public/android/java/src/org/chromium/content/browser/ServiceRegistrar.java index 6065fa5..451ab4f 100644 --- a/content/public/android/java/src/org/chromium/content/browser/ServiceRegistrar.java +++ b/content/public/android/java/src/org/chromium/content/browser/ServiceRegistrar.java @@ -6,8 +6,8 @@ package org.chromium.content.browser; import android.content.Context; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.content.browser.ServiceRegistry.ImplementationFactory; import org.chromium.device.battery.BatteryMonitorFactory; import org.chromium.mojom.device.BatteryMonitor; diff --git a/content/public/android/java/src/org/chromium/content/browser/ServiceRegistry.java b/content/public/android/java/src/org/chromium/content/browser/ServiceRegistry.java index bfcbb99..21a7aac 100644 --- a/content/public/android/java/src/org/chromium/content/browser/ServiceRegistry.java +++ b/content/public/android/java/src/org/chromium/content/browser/ServiceRegistry.java @@ -4,8 +4,8 @@ package org.chromium.content.browser; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.mojo.bindings.Interface; import org.chromium.mojo.bindings.Interface.Proxy; import org.chromium.mojo.bindings.InterfaceRequest; diff --git a/content/public/android/java/src/org/chromium/content/browser/SpeechRecognition.java b/content/public/android/java/src/org/chromium/content/browser/SpeechRecognition.java index 6d535cb..8a2a54b 100644 --- a/content/public/android/java/src/org/chromium/content/browser/SpeechRecognition.java +++ b/content/public/android/java/src/org/chromium/content/browser/SpeechRecognition.java @@ -16,9 +16,9 @@ import android.speech.RecognitionService; import android.speech.RecognizerIntent; import android.speech.SpeechRecognizer; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.PackageUtils; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.content_public.common.SpeechRecognitionErrorCode; import java.util.ArrayList; diff --git a/content/public/android/java/src/org/chromium/content/browser/TimeZoneMonitor.java b/content/public/android/java/src/org/chromium/content/browser/TimeZoneMonitor.java index 2a36d25..ff17264 100644 --- a/content/public/android/java/src/org/chromium/content/browser/TimeZoneMonitor.java +++ b/content/public/android/java/src/org/chromium/content/browser/TimeZoneMonitor.java @@ -9,9 +9,9 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.Log; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * Android implementation details for content::TimeZoneMonitorAndroid. diff --git a/content/public/android/java/src/org/chromium/content/browser/TracingControllerAndroid.java b/content/public/android/java/src/org/chromium/content/browser/TracingControllerAndroid.java index 82a0cad..49a1391 100644 --- a/content/public/android/java/src/org/chromium/content/browser/TracingControllerAndroid.java +++ b/content/public/android/java/src/org/chromium/content/browser/TracingControllerAndroid.java @@ -12,9 +12,9 @@ import android.os.Environment; import android.text.TextUtils; import android.widget.Toast; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.Log; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.content.R; import java.io.File; diff --git a/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java b/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java index 9d961ab..3b049e9 100644 --- a/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java +++ b/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java @@ -21,8 +21,8 @@ import android.view.accessibility.AccessibilityManager; import android.view.accessibility.AccessibilityNodeInfo; import android.view.accessibility.AccessibilityNodeProvider; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.RenderCoordinates; diff --git a/content/public/android/java/src/org/chromium/content/browser/accessibility/LollipopBrowserAccessibilityManager.java b/content/public/android/java/src/org/chromium/content/browser/accessibility/LollipopBrowserAccessibilityManager.java index 173689f..e83ae59 100644 --- a/content/public/android/java/src/org/chromium/content/browser/accessibility/LollipopBrowserAccessibilityManager.java +++ b/content/public/android/java/src/org/chromium/content/browser/accessibility/LollipopBrowserAccessibilityManager.java @@ -10,8 +10,8 @@ import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityNodeInfo; import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.content.browser.ContentViewCore; /** diff --git a/content/public/android/java/src/org/chromium/content/browser/framehost/NavigationControllerImpl.java b/content/public/android/java/src/org/chromium/content/browser/framehost/NavigationControllerImpl.java index c4ce845..9e83fc5 100644 --- a/content/public/android/java/src/org/chromium/content/browser/framehost/NavigationControllerImpl.java +++ b/content/public/android/java/src/org/chromium/content/browser/framehost/NavigationControllerImpl.java @@ -6,9 +6,9 @@ package org.chromium.content.browser.framehost; import android.graphics.Bitmap; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.content_public.browser.LoadUrlParams; import org.chromium.content_public.browser.NavigationController; import org.chromium.content_public.browser.NavigationEntry; diff --git a/content/public/android/java/src/org/chromium/content/browser/input/DateTimeChooserAndroid.java b/content/public/android/java/src/org/chromium/content/browser/input/DateTimeChooserAndroid.java index 89d8364..e76f933 100644 --- a/content/public/android/java/src/org/chromium/content/browser/input/DateTimeChooserAndroid.java +++ b/content/public/android/java/src/org/chromium/content/browser/input/DateTimeChooserAndroid.java @@ -7,8 +7,8 @@ package org.chromium.content.browser.input; import android.app.Activity; import android.content.Context; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.ui.base.WindowAndroid; import org.chromium.ui.picker.DateTimeSuggestion; import org.chromium.ui.picker.InputDialogContainer; diff --git a/content/public/android/java/src/org/chromium/content/browser/input/GamepadList.java b/content/public/android/java/src/org/chromium/content/browser/input/GamepadList.java index 49aacf9..5d71109 100644 --- a/content/public/android/java/src/org/chromium/content/browser/input/GamepadList.java +++ b/content/public/android/java/src/org/chromium/content/browser/input/GamepadList.java @@ -13,9 +13,9 @@ import android.view.InputEvent; import android.view.KeyEvent; import android.view.MotionEvent; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.ThreadUtils; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.content.browser.ContentView; /** diff --git a/content/public/android/java/src/org/chromium/content/browser/input/GamepadMappings.java b/content/public/android/java/src/org/chromium/content/browser/input/GamepadMappings.java index fee108b..1ded67f 100644 --- a/content/public/android/java/src/org/chromium/content/browser/input/GamepadMappings.java +++ b/content/public/android/java/src/org/chromium/content/browser/input/GamepadMappings.java @@ -7,8 +7,8 @@ package org.chromium.content.browser.input; import android.view.KeyEvent; import android.view.MotionEvent; -import org.chromium.base.JNINamespace; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.JNINamespace; /** * Class to manage mapping information related to each supported gamepad controller device. diff --git a/content/public/android/java/src/org/chromium/content/browser/input/HandleViewResources.java b/content/public/android/java/src/org/chromium/content/browser/input/HandleViewResources.java index 926cfce..9dfccc8 100644 --- a/content/public/android/java/src/org/chromium/content/browser/input/HandleViewResources.java +++ b/content/public/android/java/src/org/chromium/content/browser/input/HandleViewResources.java @@ -13,8 +13,8 @@ import android.graphics.Canvas; import android.graphics.drawable.Drawable; import org.chromium.base.ApiCompatibilityUtils; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * Helper class for retrieving resources related to selection handles. diff --git a/content/public/android/java/src/org/chromium/content/browser/input/ImeAdapter.java b/content/public/android/java/src/org/chromium/content/browser/input/ImeAdapter.java index e562b2a..955873f 100644 --- a/content/public/android/java/src/org/chromium/content/browser/input/ImeAdapter.java +++ b/content/public/android/java/src/org/chromium/content/browser/input/ImeAdapter.java @@ -18,9 +18,9 @@ import android.view.KeyEvent; import android.view.View; import android.view.inputmethod.EditorInfo; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.blink_public.web.WebInputEventModifier; import org.chromium.blink_public.web.WebInputEventType; import org.chromium.blink_public.web.WebTextInputFlags; diff --git a/content/public/android/java/src/org/chromium/content/browser/input/PopupTouchHandleDrawable.java b/content/public/android/java/src/org/chromium/content/browser/input/PopupTouchHandleDrawable.java index 0472287..8d68dec 100644 --- a/content/public/android/java/src/org/chromium/content/browser/input/PopupTouchHandleDrawable.java +++ b/content/public/android/java/src/org/chromium/content/browser/input/PopupTouchHandleDrawable.java @@ -13,8 +13,8 @@ import android.view.View; import android.view.animation.AnimationUtils; import android.widget.PopupWindow; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.content.browser.PositionObserver; import org.chromium.ui.touch_selection.TouchHandleOrientation; diff --git a/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java b/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java index 05774dc..5584b3e 100644 --- a/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java +++ b/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java @@ -10,9 +10,9 @@ import android.os.Parcel; import android.os.ParcelUuid; import android.os.Parcelable; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.content_public.browser.AccessibilitySnapshotCallback; import org.chromium.content_public.browser.AccessibilitySnapshotNode; import org.chromium.content_public.browser.JavaScriptCallback; diff --git a/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsObserverProxy.java b/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsObserverProxy.java index 316efa5..2331a24 100644 --- a/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsObserverProxy.java +++ b/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsObserverProxy.java @@ -4,11 +4,11 @@ package org.chromium.content.browser.webcontents; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.ObserverList; import org.chromium.base.ObserverList.RewindableIterator; import org.chromium.base.ThreadUtils; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.content_public.browser.WebContentsObserver; /** diff --git a/content/public/android/java/src/org/chromium/content_public/browser/LoadUrlParams.java b/content/public/android/java/src/org/chromium/content_public/browser/LoadUrlParams.java index 5cc3c3f..770c6ae 100644 --- a/content/public/android/java/src/org/chromium/content_public/browser/LoadUrlParams.java +++ b/content/public/android/java/src/org/chromium/content_public/browser/LoadUrlParams.java @@ -4,8 +4,8 @@ package org.chromium.content_public.browser; -import org.chromium.base.JNINamespace; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.JNINamespace; import org.chromium.base.annotations.SuppressFBWarnings; import org.chromium.content_public.browser.navigation_controller.LoadURLType; import org.chromium.content_public.browser.navigation_controller.UserAgentOverrideOption; diff --git a/content/public/test/android/javatests/src/org/chromium/content/browser/test/NestedSystemMessageHandler.java b/content/public/test/android/javatests/src/org/chromium/content/browser/test/NestedSystemMessageHandler.java index c6f4649..180c1a0 100644 --- a/content/public/test/android/javatests/src/org/chromium/content/browser/test/NestedSystemMessageHandler.java +++ b/content/public/test/android/javatests/src/org/chromium/content/browser/test/NestedSystemMessageHandler.java @@ -9,8 +9,8 @@ import android.os.Looper; import android.os.Message; import android.os.MessageQueue; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; diff --git a/content/shell/android/java/src/org/chromium/content_shell/Shell.java b/content/shell/android/java/src/org/chromium/content_shell/Shell.java index 29d9ecd..da99918 100644 --- a/content/shell/android/java/src/org/chromium/content_shell/Shell.java +++ b/content/shell/android/java/src/org/chromium/content_shell/Shell.java @@ -20,8 +20,8 @@ import android.widget.LinearLayout; import android.widget.TextView; import android.widget.TextView.OnEditorActionListener; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.content.browser.ContentView; import org.chromium.content.browser.ContentViewClient; import org.chromium.content.browser.ContentViewCore; diff --git a/content/shell/android/java/src/org/chromium/content_shell/ShellLayoutTestUtils.java b/content/shell/android/java/src/org/chromium/content_shell/ShellLayoutTestUtils.java index 5ea2f77..7a55269 100644 --- a/content/shell/android/java/src/org/chromium/content_shell/ShellLayoutTestUtils.java +++ b/content/shell/android/java/src/org/chromium/content_shell/ShellLayoutTestUtils.java @@ -6,8 +6,8 @@ package org.chromium.content_shell; import android.content.Context; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * Utility methods used by content_shell for running Blink's layout tests on Android. diff --git a/content/shell/android/java/src/org/chromium/content_shell/ShellManager.java b/content/shell/android/java/src/org/chromium/content_shell/ShellManager.java index b6b7948..278291c 100644 --- a/content/shell/android/java/src/org/chromium/content_shell/ShellManager.java +++ b/content/shell/android/java/src/org/chromium/content_shell/ShellManager.java @@ -11,10 +11,10 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.FrameLayout; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.ThreadUtils; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.content.browser.ActivityContentVideoViewClient; import org.chromium.content.browser.ContentVideoViewClient; import org.chromium.content.browser.ContentViewClient; diff --git a/content/shell/android/java/src/org/chromium/content_shell/ShellMojoTestUtils.java b/content/shell/android/java/src/org/chromium/content_shell/ShellMojoTestUtils.java index 984e79d..b50e1a7 100644 --- a/content/shell/android/java/src/org/chromium/content_shell/ShellMojoTestUtils.java +++ b/content/shell/android/java/src/org/chromium/content_shell/ShellMojoTestUtils.java @@ -4,8 +4,8 @@ package org.chromium.content_shell; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.content.browser.ServiceRegistry; import org.chromium.mojo.system.Pair; diff --git a/content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.java b/content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.java index 0ca4e49..da6cdec 100644 --- a/content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.java +++ b/content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.java @@ -6,7 +6,7 @@ package org.chromium.chromium_linker_test_apk; import android.util.Log; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.JNINamespace; import org.chromium.base.library_loader.Linker; /** @@ -47,10 +47,11 @@ public class LinkerTests implements Linker.TestRunner { checkSharedRelro = true; } - if (checkSharedRelro) + if (checkSharedRelro) { return nativeCheckForSharedRelros(isBrowserProcess); - else + } else { return nativeCheckForNoSharedRelros(isBrowserProcess); + } } // Check that there are shared RELRO sections in the current process, diff --git a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java index ff864fd..0533265 100644 --- a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java +++ b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java @@ -10,9 +10,9 @@ import android.bluetooth.le.ScanSettings; import android.os.Build; import android.os.ParcelUuid; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.Log; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import java.util.List; diff --git a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothDevice.java b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothDevice.java index cca60b0..3536bf8 100644 --- a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothDevice.java +++ b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothDevice.java @@ -9,9 +9,9 @@ import android.bluetooth.BluetoothDevice; import android.os.Build; import android.os.ParcelUuid; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.Log; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import java.util.List; diff --git a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/Wrappers.java b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/Wrappers.java index fb49387..928d3ba 100644 --- a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/Wrappers.java +++ b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/Wrappers.java @@ -18,9 +18,9 @@ import android.content.pm.PackageManager; import android.os.Build; import android.os.ParcelUuid; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.Log; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import java.util.ArrayList; import java.util.HashMap; diff --git a/device/bluetooth/test/android/java/src/org/chromium/device/bluetooth/Fakes.java b/device/bluetooth/test/android/java/src/org/chromium/device/bluetooth/Fakes.java index 5e63b66..6efafecc 100644 --- a/device/bluetooth/test/android/java/src/org/chromium/device/bluetooth/Fakes.java +++ b/device/bluetooth/test/android/java/src/org/chromium/device/bluetooth/Fakes.java @@ -11,8 +11,8 @@ import android.bluetooth.le.ScanSettings; import android.os.Build; import android.os.ParcelUuid; -import org.chromium.base.CalledByNative; import org.chromium.base.Log; +import org.chromium.base.annotations.CalledByNative; import java.util.ArrayList; import java.util.List; diff --git a/device/vibration/android/java/src/org/chromium/device/vibration/VibrationProvider.java b/device/vibration/android/java/src/org/chromium/device/vibration/VibrationProvider.java index 37dc1b2..0f12d7c 100644 --- a/device/vibration/android/java/src/org/chromium/device/vibration/VibrationProvider.java +++ b/device/vibration/android/java/src/org/chromium/device/vibration/VibrationProvider.java @@ -10,8 +10,8 @@ import android.media.AudioManager; import android.os.Vibrator; import android.util.Log; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * This is the implementation of the C++ counterpart VibrationProvider. diff --git a/mandoline/app/android/apk/src/org/chromium/mandoline/MandolineActivity.java b/mandoline/app/android/apk/src/org/chromium/mandoline/MandolineActivity.java index bfe9000..7aa748a 100644 --- a/mandoline/app/android/apk/src/org/chromium/mandoline/MandolineActivity.java +++ b/mandoline/app/android/apk/src/org/chromium/mandoline/MandolineActivity.java @@ -9,8 +9,8 @@ import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import org.chromium.base.JNINamespace; import org.chromium.base.Log; +import org.chromium.base.annotations.JNINamespace; import org.chromium.mojo.shell.ShellMain; /** diff --git a/media/base/android/java/src/org/chromium/media/AudioManagerAndroid.java b/media/base/android/java/src/org/chromium/media/AudioManagerAndroid.java index 7b68260..f598d05 100644 --- a/media/base/android/java/src/org/chromium/media/AudioManagerAndroid.java +++ b/media/base/android/java/src/org/chromium/media/AudioManagerAndroid.java @@ -25,9 +25,9 @@ import android.os.HandlerThread; import android.os.Process; import android.provider.Settings; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.Log; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.base.annotations.SuppressFBWarnings; import java.util.ArrayList; diff --git a/media/base/android/java/src/org/chromium/media/AudioRecordInput.java b/media/base/android/java/src/org/chromium/media/AudioRecordInput.java index 3a8a71e..89d694a 100644 --- a/media/base/android/java/src/org/chromium/media/AudioRecordInput.java +++ b/media/base/android/java/src/org/chromium/media/AudioRecordInput.java @@ -13,9 +13,9 @@ import android.media.audiofx.AudioEffect; import android.media.audiofx.AudioEffect.Descriptor; import android.os.Process; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.Log; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import java.nio.ByteBuffer; diff --git a/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java b/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java index eb62b9b..2f09e31 100644 --- a/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java +++ b/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java @@ -17,9 +17,9 @@ import android.os.Build; import android.os.Bundle; import android.view.Surface; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.Log; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import java.nio.ByteBuffer; import java.util.ArrayList; diff --git a/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java b/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java index a5c6f89..6a0847d 100644 --- a/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java +++ b/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java @@ -11,9 +11,9 @@ import android.os.AsyncTask; import android.os.Build; import android.os.Handler; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.Log; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import java.io.BufferedInputStream; import java.io.ByteArrayOutputStream; diff --git a/media/base/android/java/src/org/chromium/media/MediaPlayerBridge.java b/media/base/android/java/src/org/chromium/media/MediaPlayerBridge.java index 2acb961..df2a627 100644 --- a/media/base/android/java/src/org/chromium/media/MediaPlayerBridge.java +++ b/media/base/android/java/src/org/chromium/media/MediaPlayerBridge.java @@ -15,9 +15,9 @@ import android.util.Base64; import android.util.Base64InputStream; import android.view.Surface; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.Log; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import java.io.ByteArrayInputStream; import java.io.File; diff --git a/media/base/android/java/src/org/chromium/media/MediaPlayerListener.java b/media/base/android/java/src/org/chromium/media/MediaPlayerListener.java index 78723b7..469e049 100644 --- a/media/base/android/java/src/org/chromium/media/MediaPlayerListener.java +++ b/media/base/android/java/src/org/chromium/media/MediaPlayerListener.java @@ -7,8 +7,8 @@ package org.chromium.media; import android.content.Context; import android.media.MediaPlayer; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; // This class implements all the listener interface for android mediaplayer. // Callbacks will be sent to the native class for processing. diff --git a/media/base/android/java/src/org/chromium/media/VideoCapture.java b/media/base/android/java/src/org/chromium/media/VideoCapture.java index 04782c9..bc8351f 100644 --- a/media/base/android/java/src/org/chromium/media/VideoCapture.java +++ b/media/base/android/java/src/org/chromium/media/VideoCapture.java @@ -9,8 +9,8 @@ import android.graphics.ImageFormat; import android.view.Surface; import android.view.WindowManager; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * Video Capture Device base class, defines a set of methods that native code diff --git a/media/base/android/java/src/org/chromium/media/VideoCaptureCamera.java b/media/base/android/java/src/org/chromium/media/VideoCaptureCamera.java index 310b33f..95aa2b6 100644 --- a/media/base/android/java/src/org/chromium/media/VideoCaptureCamera.java +++ b/media/base/android/java/src/org/chromium/media/VideoCaptureCamera.java @@ -10,8 +10,8 @@ import android.graphics.SurfaceTexture; import android.opengl.GLES20; import android.os.Build; -import org.chromium.base.JNINamespace; import org.chromium.base.Log; +import org.chromium.base.annotations.JNINamespace; import java.io.IOException; import java.util.List; diff --git a/media/base/android/java/src/org/chromium/media/VideoCaptureCamera2.java b/media/base/android/java/src/org/chromium/media/VideoCaptureCamera2.java index f60d620..49b8cf3 100644 --- a/media/base/android/java/src/org/chromium/media/VideoCaptureCamera2.java +++ b/media/base/android/java/src/org/chromium/media/VideoCaptureCamera2.java @@ -23,8 +23,8 @@ import android.os.HandlerThread; import android.util.Size; import android.view.Surface; -import org.chromium.base.JNINamespace; import org.chromium.base.Log; +import org.chromium.base.annotations.JNINamespace; import java.nio.ByteBuffer; import java.util.ArrayList; diff --git a/media/base/android/java/src/org/chromium/media/VideoCaptureFactory.java b/media/base/android/java/src/org/chromium/media/VideoCaptureFactory.java index 5013395..bbed99f 100644 --- a/media/base/android/java/src/org/chromium/media/VideoCaptureFactory.java +++ b/media/base/android/java/src/org/chromium/media/VideoCaptureFactory.java @@ -10,9 +10,9 @@ import android.content.pm.PackageManager; import android.os.Build; import org.chromium.base.BuildInfo; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.Log; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * This class implements a factory of Android Video Capture objects for Chrome. diff --git a/media/base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java b/media/base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java index 239e6d4..a40ba7f 100644 --- a/media/base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java +++ b/media/base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java @@ -11,9 +11,9 @@ import android.media.MediaExtractor; import android.media.MediaFormat; import android.os.ParcelFileDescriptor; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.Log; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import java.io.File; import java.nio.ByteBuffer; diff --git a/media/midi/java/src/org/chromium/media/midi/UsbMidiDeviceAndroid.java b/media/midi/java/src/org/chromium/media/midi/UsbMidiDeviceAndroid.java index 4bdd5f5..8b41220 100644 --- a/media/midi/java/src/org/chromium/media/midi/UsbMidiDeviceAndroid.java +++ b/media/midi/java/src/org/chromium/media/midi/UsbMidiDeviceAndroid.java @@ -16,8 +16,8 @@ import android.os.Build; import android.os.Handler; import android.util.SparseArray; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import java.nio.ByteBuffer; import java.util.Arrays; diff --git a/media/midi/java/src/org/chromium/media/midi/UsbMidiDeviceFactoryAndroid.java b/media/midi/java/src/org/chromium/media/midi/UsbMidiDeviceFactoryAndroid.java index 26227e8..0dc0c2c 100644 --- a/media/midi/java/src/org/chromium/media/midi/UsbMidiDeviceFactoryAndroid.java +++ b/media/midi/java/src/org/chromium/media/midi/UsbMidiDeviceFactoryAndroid.java @@ -15,8 +15,8 @@ import android.hardware.usb.UsbInterface; import android.hardware.usb.UsbManager; import android.os.Parcelable; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import java.util.ArrayList; import java.util.HashSet; diff --git a/mojo/android/javatests/src/org/chromium/mojo/MojoTestCase.java b/mojo/android/javatests/src/org/chromium/mojo/MojoTestCase.java index 8632a13..4e96de2 100644 --- a/mojo/android/javatests/src/org/chromium/mojo/MojoTestCase.java +++ b/mojo/android/javatests/src/org/chromium/mojo/MojoTestCase.java @@ -7,7 +7,7 @@ package org.chromium.mojo; import android.content.Context; import android.test.InstrumentationTestCase; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.JNINamespace; import org.chromium.base.library_loader.LibraryLoader; import org.chromium.base.library_loader.LibraryProcessType; diff --git a/mojo/android/javatests/src/org/chromium/mojo/bindings/ValidationTestUtil.java b/mojo/android/javatests/src/org/chromium/mojo/bindings/ValidationTestUtil.java index 605cfb0..91b993c 100644 --- a/mojo/android/javatests/src/org/chromium/mojo/bindings/ValidationTestUtil.java +++ b/mojo/android/javatests/src/org/chromium/mojo/bindings/ValidationTestUtil.java @@ -4,8 +4,8 @@ package org.chromium.mojo.bindings; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/mojo/android/system/src/org/chromium/mojo/system/impl/BaseRunLoop.java b/mojo/android/system/src/org/chromium/mojo/system/impl/BaseRunLoop.java index 0d09560..dfe92ef 100644 --- a/mojo/android/system/src/org/chromium/mojo/system/impl/BaseRunLoop.java +++ b/mojo/android/system/src/org/chromium/mojo/system/impl/BaseRunLoop.java @@ -4,12 +4,10 @@ package org.chromium.mojo.system.impl; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.mojo.system.RunLoop; -import java.lang.Runnable; - /** * Implementation of {@link RunLoop} suitable for the base:: message loop implementation. */ diff --git a/mojo/android/system/src/org/chromium/mojo/system/impl/CoreImpl.java b/mojo/android/system/src/org/chromium/mojo/system/impl/CoreImpl.java index 0cc2b8c..52599da 100644 --- a/mojo/android/system/src/org/chromium/mojo/system/impl/CoreImpl.java +++ b/mojo/android/system/src/org/chromium/mojo/system/impl/CoreImpl.java @@ -4,8 +4,8 @@ package org.chromium.mojo.system.impl; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.mojo.system.AsyncWaiter; import org.chromium.mojo.system.Core; import org.chromium.mojo.system.DataPipe; diff --git a/mojo/runner/android/apk/src/org/chromium/mojo/shell/AndroidHandler.java b/mojo/runner/android/apk/src/org/chromium/mojo/shell/AndroidHandler.java index 8fecb66..2eb4075 100644 --- a/mojo/runner/android/apk/src/org/chromium/mojo/shell/AndroidHandler.java +++ b/mojo/runner/android/apk/src/org/chromium/mojo/shell/AndroidHandler.java @@ -8,9 +8,9 @@ import android.content.Context; import dalvik.system.DexClassLoader; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.Log; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import java.io.File; import java.io.FilenameFilter; diff --git a/mojo/runner/android/apk/src/org/chromium/mojo/shell/Bootstrap.java b/mojo/runner/android/apk/src/org/chromium/mojo/shell/Bootstrap.java index 81247a2..9f78fb1 100644 --- a/mojo/runner/android/apk/src/org/chromium/mojo/shell/Bootstrap.java +++ b/mojo/runner/android/apk/src/org/chromium/mojo/shell/Bootstrap.java @@ -6,7 +6,7 @@ package org.chromium.mojo.shell; import android.content.Context; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.JNINamespace; import java.io.File; diff --git a/mojo/runner/android/apk/src/org/chromium/mojo/shell/ShellMain.java b/mojo/runner/android/apk/src/org/chromium/mojo/shell/ShellMain.java index 771b9c5..942c19c 100644 --- a/mojo/runner/android/apk/src/org/chromium/mojo/shell/ShellMain.java +++ b/mojo/runner/android/apk/src/org/chromium/mojo/shell/ShellMain.java @@ -11,8 +11,8 @@ import android.content.pm.PackageManager; import android.os.Bundle; import android.util.Log; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import java.io.File; import java.util.ArrayList; diff --git a/mojo/runner/android/tests/src/org/chromium/mojo/shell/ShellTestBase.java b/mojo/runner/android/tests/src/org/chromium/mojo/shell/ShellTestBase.java index bb57672..98a53ad 100644 --- a/mojo/runner/android/tests/src/org/chromium/mojo/shell/ShellTestBase.java +++ b/mojo/runner/android/tests/src/org/chromium/mojo/shell/ShellTestBase.java @@ -6,9 +6,9 @@ package org.chromium.mojo.shell; import android.content.Context; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.Log; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import java.io.File; import java.io.IOException; diff --git a/net/android/java/src/org/chromium/net/AndroidCertVerifyResult.java b/net/android/java/src/org/chromium/net/AndroidCertVerifyResult.java index fd6fca1..3110e60 100644 --- a/net/android/java/src/org/chromium/net/AndroidCertVerifyResult.java +++ b/net/android/java/src/org/chromium/net/AndroidCertVerifyResult.java @@ -4,8 +4,8 @@ package org.chromium.net; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import java.security.cert.CertificateEncodingException; import java.security.cert.X509Certificate; diff --git a/net/android/java/src/org/chromium/net/AndroidKeyStore.java b/net/android/java/src/org/chromium/net/AndroidKeyStore.java index 89ace17..b4fadba 100644 --- a/net/android/java/src/org/chromium/net/AndroidKeyStore.java +++ b/net/android/java/src/org/chromium/net/AndroidKeyStore.java @@ -4,8 +4,8 @@ package org.chromium.net; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * Specifies all the dependencies from the native OpenSSL engine on an Android KeyStore. diff --git a/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java b/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java index 1ee1459..3e8eda2 100644 --- a/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java +++ b/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java @@ -11,7 +11,7 @@ import android.security.KeyChain; import android.telephony.TelephonyManager; import android.util.Log; -import org.chromium.base.CalledByNative; +import org.chromium.base.annotations.CalledByNative; import org.chromium.base.annotations.CalledByNativeUnchecked; import java.net.NetworkInterface; diff --git a/net/android/java/src/org/chromium/net/AndroidPrivateKey.java b/net/android/java/src/org/chromium/net/AndroidPrivateKey.java index a6df6d4..d1fade8 100644 --- a/net/android/java/src/org/chromium/net/AndroidPrivateKey.java +++ b/net/android/java/src/org/chromium/net/AndroidPrivateKey.java @@ -4,8 +4,8 @@ package org.chromium.net; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * Abstract private key that bundles the PrivateKey and AndroidKeyStore that it belongs to. diff --git a/net/android/java/src/org/chromium/net/GURLUtils.java b/net/android/java/src/org/chromium/net/GURLUtils.java index f69ea25..c9a3933 100644 --- a/net/android/java/src/org/chromium/net/GURLUtils.java +++ b/net/android/java/src/org/chromium/net/GURLUtils.java @@ -4,7 +4,7 @@ package org.chromium.net; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.JNINamespace; /** * Class to access the GURL library from java. diff --git a/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java b/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java index 38dba5a..917f174 100644 --- a/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java +++ b/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java @@ -14,10 +14,10 @@ import android.os.Bundle; import android.os.Handler; import org.chromium.base.ApplicationStatus; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.ThreadUtils; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import java.io.IOException; diff --git a/net/android/java/src/org/chromium/net/NetStringUtil.java b/net/android/java/src/org/chromium/net/NetStringUtil.java index 81bcfee..980b185 100644 --- a/net/android/java/src/org/chromium/net/NetStringUtil.java +++ b/net/android/java/src/org/chromium/net/NetStringUtil.java @@ -4,8 +4,8 @@ package org.chromium.net; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import java.nio.ByteBuffer; import java.nio.charset.Charset; diff --git a/net/android/java/src/org/chromium/net/NetworkChangeNotifier.java b/net/android/java/src/org/chromium/net/NetworkChangeNotifier.java index 4db6d47..563ef5c 100644 --- a/net/android/java/src/org/chromium/net/NetworkChangeNotifier.java +++ b/net/android/java/src/org/chromium/net/NetworkChangeNotifier.java @@ -6,10 +6,10 @@ package org.chromium.net; import android.content.Context; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; -import org.chromium.base.NativeClassQualifiedName; import org.chromium.base.ObserverList; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; +import org.chromium.base.annotations.NativeClassQualifiedName; import java.util.ArrayList; diff --git a/net/android/java/src/org/chromium/net/ProxyChangeListener.java b/net/android/java/src/org/chromium/net/ProxyChangeListener.java index 68cc329..7df2d3b 100644 --- a/net/android/java/src/org/chromium/net/ProxyChangeListener.java +++ b/net/android/java/src/org/chromium/net/ProxyChangeListener.java @@ -14,9 +14,9 @@ import android.os.Build; import android.text.TextUtils; import android.util.Log; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; -import org.chromium.base.NativeClassQualifiedName; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; +import org.chromium.base.annotations.NativeClassQualifiedName; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/net/android/java/src/org/chromium/net/X509Util.java b/net/android/java/src/org/chromium/net/X509Util.java index 3906ab7..9106386 100644 --- a/net/android/java/src/org/chromium/net/X509Util.java +++ b/net/android/java/src/org/chromium/net/X509Util.java @@ -15,7 +15,7 @@ import android.security.KeyChain; import android.util.Log; import android.util.Pair; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.JNINamespace; import org.chromium.base.annotations.SuppressFBWarnings; import java.io.ByteArrayInputStream; diff --git a/net/android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java b/net/android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java index a4cb947..a35427a 100644 --- a/net/android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java +++ b/net/android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java @@ -6,8 +6,8 @@ package org.chromium.net; import android.util.Log; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import java.security.KeyFactory; import java.security.NoSuchAlgorithmException; diff --git a/net/test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthenticator.java b/net/test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthenticator.java index 1c8b0c0..f5c82ad 100644 --- a/net/test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthenticator.java +++ b/net/test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthenticator.java @@ -16,9 +16,9 @@ import android.content.Context; import android.os.Bundle; import org.chromium.base.ApplicationStatus; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; -import org.chromium.base.NativeClassQualifiedName; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; +import org.chromium.base.annotations.NativeClassQualifiedName; import org.chromium.net.HttpNegotiateConstants; import java.io.IOException; diff --git a/net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java b/net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java index 06ab79e..2eab279 100644 --- a/net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java +++ b/net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java @@ -4,8 +4,8 @@ package org.chromium.net.test; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import java.io.File; diff --git a/printing/android/java/src/org/chromium/printing/PrintingContext.java b/printing/android/java/src/org/chromium/printing/PrintingContext.java index 6dc7b55..b6c2c11 100644 --- a/printing/android/java/src/org/chromium/printing/PrintingContext.java +++ b/printing/android/java/src/org/chromium/printing/PrintingContext.java @@ -7,9 +7,9 @@ package org.chromium.printing; import android.print.PrintDocumentAdapter; import android.util.SparseArray; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.ThreadUtils; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * This class is responsible for communicating with its native counterpart through JNI to handle diff --git a/remoting/android/java/src/org/chromium/chromoting/jni/JniInterface.java b/remoting/android/java/src/org/chromium/chromoting/jni/JniInterface.java index 7057179..2323a0a 100644 --- a/remoting/android/java/src/org/chromium/chromoting/jni/JniInterface.java +++ b/remoting/android/java/src/org/chromium/chromoting/jni/JniInterface.java @@ -10,8 +10,8 @@ import android.graphics.Point; import android.os.Looper; import android.util.Log; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.chromoting.CapabilityManager; import org.chromium.chromoting.R; import org.chromium.chromoting.SessionAuthenticator; diff --git a/testing/android/native_test/java/src/org/chromium/native_test/NativeTestActivity.java b/testing/android/native_test/java/src/org/chromium/native_test/NativeTestActivity.java index 8e147201..73a563c 100644 --- a/testing/android/native_test/java/src/org/chromium/native_test/NativeTestActivity.java +++ b/testing/android/native_test/java/src/org/chromium/native_test/NativeTestActivity.java @@ -13,8 +13,8 @@ import android.os.Handler; import android.os.Process; import org.chromium.base.CommandLine; -import org.chromium.base.JNINamespace; import org.chromium.base.Log; +import org.chromium.base.annotations.JNINamespace; import org.chromium.test.reporter.TestStatusReporter; import java.io.File; diff --git a/ui/android/java/src/org/chromium/ui/base/Clipboard.java b/ui/android/java/src/org/chromium/ui/base/Clipboard.java index 317e21a..b691d39 100644 --- a/ui/android/java/src/org/chromium/ui/base/Clipboard.java +++ b/ui/android/java/src/org/chromium/ui/base/Clipboard.java @@ -9,8 +9,8 @@ import android.content.ClipboardManager; import android.content.Context; import android.widget.Toast; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.ui.R; /** diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java index 066019f..78ba682 100644 --- a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java +++ b/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java @@ -6,7 +6,7 @@ package org.chromium.ui.base; import android.content.Context; -import org.chromium.base.CalledByNative; +import org.chromium.base.annotations.CalledByNative; /** * UI utilities for accessing form factor information. diff --git a/ui/android/java/src/org/chromium/ui/base/LocalizationUtils.java b/ui/android/java/src/org/chromium/ui/base/LocalizationUtils.java index eec186cb..e163b3f 100644 --- a/ui/android/java/src/org/chromium/ui/base/LocalizationUtils.java +++ b/ui/android/java/src/org/chromium/ui/base/LocalizationUtils.java @@ -9,8 +9,8 @@ import android.view.View; import org.chromium.base.ApiCompatibilityUtils; import org.chromium.base.ApplicationStatus; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import java.util.Locale; diff --git a/ui/android/java/src/org/chromium/ui/base/ResourceBundle.java b/ui/android/java/src/org/chromium/ui/base/ResourceBundle.java index b29a291..adbf8af 100644 --- a/ui/android/java/src/org/chromium/ui/base/ResourceBundle.java +++ b/ui/android/java/src/org/chromium/ui/base/ResourceBundle.java @@ -8,10 +8,10 @@ import android.content.Context; import android.content.res.Resources; import android.content.res.TypedArray; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; import org.chromium.base.ResourceExtractor; import org.chromium.base.ThreadUtils; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.base.annotations.SuppressFBWarnings; import java.io.File; diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java index 14c63ac..1a71485 100644 --- a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java +++ b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java @@ -19,10 +19,10 @@ import android.provider.MediaStore; import android.text.TextUtils; import android.util.Log; -import org.chromium.base.CalledByNative; import org.chromium.base.ContentUriUtils; -import org.chromium.base.JNINamespace; import org.chromium.base.VisibleForTesting; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.ui.R; import org.chromium.ui.UiUtils; diff --git a/ui/android/java/src/org/chromium/ui/base/TouchDevice.java b/ui/android/java/src/org/chromium/ui/base/TouchDevice.java index a5fc979..e34441d 100644 --- a/ui/android/java/src/org/chromium/ui/base/TouchDevice.java +++ b/ui/android/java/src/org/chromium/ui/base/TouchDevice.java @@ -8,8 +8,8 @@ import android.content.Context; import android.content.pm.PackageManager; import android.view.InputDevice; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * Simple proxy for querying input device properties from C++. diff --git a/ui/android/java/src/org/chromium/ui/base/WindowAndroid.java b/ui/android/java/src/org/chromium/ui/base/WindowAndroid.java index 181ed07..2db31b6 100644 --- a/ui/android/java/src/org/chromium/ui/base/WindowAndroid.java +++ b/ui/android/java/src/org/chromium/ui/base/WindowAndroid.java @@ -25,8 +25,8 @@ import android.view.ViewGroup; import android.view.accessibility.AccessibilityManager; import android.widget.Toast; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.ui.VSyncMonitor; import java.lang.ref.WeakReference; diff --git a/ui/android/java/src/org/chromium/ui/gfx/BitmapHelper.java b/ui/android/java/src/org/chromium/ui/gfx/BitmapHelper.java index d921efa..cac7f5b 100644 --- a/ui/android/java/src/org/chromium/ui/gfx/BitmapHelper.java +++ b/ui/android/java/src/org/chromium/ui/gfx/BitmapHelper.java @@ -6,8 +6,8 @@ package org.chromium.ui.gfx; import android.graphics.Bitmap; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * Helper class to decode and sample down bitmap resources. diff --git a/ui/android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java b/ui/android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java index da8e026..44c5990 100644 --- a/ui/android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java +++ b/ui/android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java @@ -14,8 +14,8 @@ import android.view.Display; import android.view.Surface; import android.view.WindowManager; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * This class facilitates access to android information typically only diff --git a/ui/android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java b/ui/android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java index fb87417..463ca9f 100644 --- a/ui/android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java +++ b/ui/android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java @@ -11,8 +11,8 @@ import android.content.res.Resources; import android.util.TypedValue; import android.view.ViewConfiguration; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.ui.R; /** diff --git a/ui/android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java b/ui/android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java index bc57e1f..3503781 100644 --- a/ui/android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java +++ b/ui/android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java @@ -6,7 +6,7 @@ package org.chromium.ui.gl; import android.graphics.SurfaceTexture; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.JNINamespace; /** * Listener to an android SurfaceTexture object for frame availability. diff --git a/ui/android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java b/ui/android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java index ac9c6bd..c619786 100644 --- a/ui/android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java +++ b/ui/android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java @@ -7,8 +7,8 @@ package org.chromium.ui.gl; import android.graphics.SurfaceTexture; import android.util.Log; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * Wrapper class for the underlying platform's SurfaceTexture in order to diff --git a/ui/android/java/src/org/chromium/ui/resources/ResourceManager.java b/ui/android/java/src/org/chromium/ui/resources/ResourceManager.java index 3bf7418..d58bdda 100644 --- a/ui/android/java/src/org/chromium/ui/resources/ResourceManager.java +++ b/ui/android/java/src/org/chromium/ui/resources/ResourceManager.java @@ -10,8 +10,8 @@ import android.graphics.Bitmap; import android.graphics.Rect; import android.util.SparseArray; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import org.chromium.ui.resources.ResourceLoader.ResourceLoaderCallback; import org.chromium.ui.resources.dynamics.DynamicResource; import org.chromium.ui.resources.dynamics.DynamicResourceLoader; diff --git a/ui/platform_window/android/java/src/org/chromium/ui/PlatformImeControllerAndroid.java b/ui/platform_window/android/java/src/org/chromium/ui/PlatformImeControllerAndroid.java index 9829643..5f87c08 100644 --- a/ui/platform_window/android/java/src/org/chromium/ui/PlatformImeControllerAndroid.java +++ b/ui/platform_window/android/java/src/org/chromium/ui/PlatformImeControllerAndroid.java @@ -10,8 +10,8 @@ import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputConnection; import android.view.inputmethod.InputMethodManager; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * Exposes IME related code to native code. diff --git a/ui/platform_window/android/java/src/org/chromium/ui/PlatformWindowAndroid.java b/ui/platform_window/android/java/src/org/chromium/ui/PlatformWindowAndroid.java index 6fe0b1c..9c77fce 100644 --- a/ui/platform_window/android/java/src/org/chromium/ui/PlatformWindowAndroid.java +++ b/ui/platform_window/android/java/src/org/chromium/ui/PlatformWindowAndroid.java @@ -15,8 +15,8 @@ import android.view.View; import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputConnection; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; /** * Exposes SurfaceView to native code. diff --git a/url/android/java/src/org/chromium/url/IDNStringUtil.java b/url/android/java/src/org/chromium/url/IDNStringUtil.java index 32000fd..37d77dc 100644 --- a/url/android/java/src/org/chromium/url/IDNStringUtil.java +++ b/url/android/java/src/org/chromium/url/IDNStringUtil.java @@ -4,8 +4,8 @@ package org.chromium.url; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import org.chromium.base.annotations.CalledByNative; +import org.chromium.base.annotations.JNINamespace; import java.net.IDN; |