Bug 856163 - Part 5: Reduce preprocessing in WebApp. r=mfinkle

--HG--
rename : mobile/android/base/WebApp.java.in => mobile/android/base/WebApp.java

mobile/android/base/AndroidManifest.xml.in

@@ -142,7 +142,7 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".WebApp"
+        <activity android:name="org.mozilla.gecko.WebApp"
                   android:label="@string/webapp_generic_name"
                   android:configChanges="keyboard|keyboardHidden|mcc|mnc|orientation|screenSize"
                   android:windowSoftInputMode="stateUnspecified|adjustResize"

mobile/android/base/GeckoAppShell.java

@@ -582,7 +582,7 @@ public class GeckoAppShell
         intent.setAction(GeckoApp.ACTION_WEBAPP_PREFIX + aIndex);
         intent.setData(Uri.parse(aURI));
         intent.setClassName(AppConstants.ANDROID_PACKAGE_NAME,
-                            AppConstants.ANDROID_PACKAGE_NAME + ".WebApps$WebApp" + aIndex);
+                            "org.mozilla.gecko.WebApps$WebApp" + aIndex);
         return intent;
     }
 

mobile/android/base/Makefile.in

@@ -161,6 +161,7 @@ FENNEC_JAVA_FILES = \
   TouchEventInterceptor.java \
   UpdateServiceHelper.java \
   VideoPlayer.java \
+  WebApp.java \
   WebAppAllocator.java \
   ZoomConstraints.java \
   db/BrowserContract.java \
@@ -259,7 +260,6 @@ FENNEC_PP_JAVA_VIEW_FILES = \
 FENNEC_PP_JAVA_FILES = \
   App.java \
   AppConstants.java \
-  WebApp.java \
   WebApps.java \
   $(NULL)
 

mobile/android/base/WebApp.java

@@ -3,8 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#filter substitution
-package @ANDROID_PACKAGE_NAME@;
+package org.mozilla.gecko;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -23,18 +22,10 @@ import android.view.animation.AnimationUtils;
 import android.view.animation.Animation;
 import android.widget.ImageView;
 import android.view.Display;
+
 import java.net.URL;
 import java.io.File;
 
-import org.mozilla.gecko.GeckoApp;
-import org.mozilla.gecko.GeckoAppShell;
-import org.mozilla.gecko.GeckoThread;
-import org.mozilla.gecko.WebAppAllocator;
-import org.mozilla.gecko.Tab;
-import org.mozilla.gecko.Tabs;
-import org.mozilla.gecko.R;
-import org.mozilla.gecko.util.HardwareUtils;
-
 public class WebApp extends GeckoApp {
     private static final String LOGTAG = "WebApp";
 
@@ -156,25 +147,6 @@ public class WebApp extends GeckoApp {
         return "webapp" + action.substring(ACTION_WEBAPP_PREFIX.length());
     }
 
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-#ifdef MOZ_PROFILING
-        if (item.getItemId() == org.mozilla.gecko.R.id.toggle_profiling) {
-            org.mozilla.gecko.GeckoAppShell.sendEventToGecko(
-                org.mozilla.gecko.GeckoEvent.createBroadcastEvent("ToggleProfiling", null));
-            return true;
-        }
-#endif
-        return super.onOptionsItemSelected(item);
-    }
-
-#ifdef MOZ_LINKER_EXTRACT
-    @Override
-    public boolean linkerExtract() {
-        return true;
-    }
-#endif
-
     @Override
     protected boolean shouldRestoreSession() {
       return false;

mobile/android/base/WebAppManifestFragment.xml.frag

@@ -1,4 +1,4 @@
-        <activity android:name=".WebApps$WebApp@APPNUM@"
+        <activity android:name="org.mozilla.gecko.WebApps$WebApp@APPNUM@"
                   android:label="@string/webapp_generic_name"
                   android:configChanges="keyboard|keyboardHidden|mcc|mnc|orientation|screenSize"
                   android:windowSoftInputMode="stateUnspecified|adjustResize"

mobile/android/base/WebApps.java.in

@@ -4,7 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #filter substitution
-package @ANDROID_PACKAGE_NAME@;
+
+package org.mozilla.gecko;
 
 public final class WebApps {