summaryrefslogtreecommitdiffstats
path: root/chromecast
diff options
context:
space:
mode:
authoraurimas <aurimas@chromium.org>2015-07-30 12:51:06 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-30 19:51:46 +0000
commitca3b8039302e6be7470b233cc8b7c6c817985d14 (patch)
tree5d846ff3ec9c43b736483f7af8866db4173cab97 /chromecast
parenta5597f6cabd7d88393f67a81df9bfe4965d574a3 (diff)
downloadchromium_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}
Diffstat (limited to 'chromecast')
-rw-r--r--chromecast/base/java/src/org/chromium/chromecast/base/ChromecastConfigAndroid.java4
-rw-r--r--chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastCrashHandler.java4
-rw-r--r--chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastMetricsHelper.java2
-rw-r--r--chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastSysInfoAndroid.java4
-rw-r--r--chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastWindowAndroid.java4
-rw-r--r--chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastWindowManager.java4
6 files changed, 11 insertions, 11 deletions
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;