No Bug - Build bustage due to merge of bug 734854. Resync GeckoEvent and AndroidJavaWrappers. r=mbrubeck

--HG--
extra : rebase_source : a50129a4a28d6c207c61ba04bbbc149e8d74f977
This commit is contained in:
Doug Turner 2012-03-20 15:26:19 -07:00
parent a96d679cba
commit a442639849
2 changed files with 10 additions and 9 deletions

View File

@ -82,14 +82,15 @@ public class GeckoEvent {
private static final int SURFACE_CREATED = 12;
private static final int SURFACE_DESTROYED = 13;
private static final int GECKO_EVENT_SYNC = 14;
private static final int ACTIVITY_START = 15;
private static final int BROADCAST = 16;
private static final int VIEWPORT = 17;
private static final int VISITED = 18;
private static final int NETWORK_CHANGED = 19;
private static final int ACTIVITY_RESUMING = 20;
private static final int SCREENSHOT = 21;
private static final int SCREENORIENTATION_CHANGED = 22;
private static final int FORCED_RESIZE = 15;
private static final int ACTIVITY_START = 16;
private static final int BROADCAST = 17;
private static final int VIEWPORT = 18;
private static final int VISITED = 19;
private static final int NETWORK_CHANGED = 20;
private static final int ACTIVITY_RESUMING = 21;
private static final int SCREENSHOT = 22;
private static final int SCREENORIENTATION_CHANGED = 23;
public static final int IME_COMPOSITION_END = 0;
public static final int IME_COMPOSITION_BEGIN = 1;

View File

@ -586,7 +586,7 @@ public:
NETWORK_CHANGED = 20,
ACTIVITY_RESUMING = 21,
SCREENSHOT = 22,
SCREENORIENTATION_CHANGED = 22,
SCREENORIENTATION_CHANGED = 23,
dummy_java_enum_list_end
};