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

Unified Diff: remoting/android/java/src/org/chromium/chromoting/jni/JniInterface.java

Issue 187313007: Reimplemented string array resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: remoting/android/java/src/org/chromium/chromoting/jni/JniInterface.java
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 cf4db0ee9c5ccdb17fad492ffb38bb559f5a6cdc..79533a32f166754b32861c1547bd45212bbaa879 100644
--- a/remoting/android/java/src/org/chromium/chromoting/jni/JniInterface.java
+++ b/remoting/android/java/src/org/chromium/chromoting/jni/JniInterface.java
@@ -18,7 +18,6 @@ import android.view.KeyEvent;
import android.view.View;
import android.widget.CheckBox;
import android.widget.TextView;
-import android.widget.Toast;
import org.chromium.base.CalledByNative;
import org.chromium.base.JNINamespace;
@@ -74,32 +73,39 @@ public class JniInterface {
* This enum must match the C++ enumeration remoting::protocol::ErrorCode.
*/
public enum Error {
- OK(0),
- PEER_IS_OFFLINE(1),
- SESSION_REJECTED(2),
- INCOMPATIBLE_PROTOCOL(3),
- AUTHENTICATION_FAILED(4),
- CHANNEL_CONNECTION_ERROR(5),
- SIGNALING_ERROR(6),
- SIGNALING_TIMEOUT(7),
- HOST_OVERLOAD(8),
- UNKNOWN_ERROR(9);
+ OK(0, 0),
+ PEER_IS_OFFLINE(1, R.string.error_host_is_offline),
+ SESSION_REJECTED(2, R.string.error_invalid_access_code),
+ INCOMPATIBLE_PROTOCOL(3, R.string.error_incompatible_protocol),
+ AUTHENTICATION_FAILED(4, R.string.error_invalid_access_code),
+ CHANNEL_CONNECTION_ERROR(5, R.string.error_p2p_failure),
+ SIGNALING_ERROR(6, R.string.error_p2p_failure),
+ SIGNALING_TIMEOUT(7, R.string.error_p2p_failure),
+ HOST_OVERLOAD(8, R.string.error_host_overload),
+ UNKNOWN_ERROR(9, R.string.error_unexpected);
private final int mValue;
+ private final int mMessage;
- Error(int value) {
+ Error(int value, int message) {
mValue = value;
+ mMessage = message;
}
public int value() {
return mValue;
}
+ public int message() {
+ return mMessage;
+ }
+
public static Error fromValue(int value) {
return values()[value];
}
}
+
/**
* Notified on connection state change.
* @param state The new connection state.
« no previous file with comments | « remoting/android/java/src/org/chromium/chromoting/Chromoting.java ('k') | remoting/protocol/connection_to_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698