Bug 799221 - Remove marketplace as an app. r=mfinkle
authorWes Johnston <wjohnston@mozilla.com>
Tue, 09 Oct 2012 10:38:30 -0700
changeset 109763 ab420f694c83275081575f88ebc1fb1d657ef3cd
parent 109762 0aa267c72cf60d6695bea5e9b74cae97ad4d16ed
child 109764 48c1645f720f6d837e2e5f00612b6920767fc735
push id23652
push userryanvm@gmail.com
push dateWed, 10 Oct 2012 01:10:20 +0000
treeherdermozilla-central@5cca0408a73f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs799221
milestone19.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 799221 - Remove marketplace as an app. r=mfinkle
mobile/android/base/AndroidManifest.xml.in
mobile/android/chrome/content/browser.js
--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -123,35 +123,16 @@
             <intent-filter>
                 <action android:name="org.mozilla.gecko.DEBUG" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
 #include @OBJDIR@/WebAppManifestFragment.xml.in
 
-        <activity android:name=".MarketplaceApp"
-                  android:label="Mozilla Marketplace"
-                  android:configChanges="keyboard|keyboardHidden|mcc|mnc|orientation|screenSize"
-                  android:windowSoftInputMode="stateUnspecified|adjustResize"
-                  android:icon="@drawable/marketplace"
-                  android:launchMode="singleTask"
-                  android:theme="@style/Gecko.NoActionBar"
-                  android:noHistory="true">
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="http" android:host="marketplace.mozilla.org"/>
-                <data android:scheme="https" android:host="marketplace.mozilla.org"/>
-            </intent-filter>
-
-        </activity>
-
         <!-- Masquerade as the Resolver so that we can be opened from the Marketplace. -->
         <activity-alias
             android:name="com.android.internal.app.ResolverActivity"
             android:targetActivity=".App"
             android:exported="true" />
 
         <receiver android:name="NotificationHandler">
             <intent-filter>
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -3175,28 +3175,16 @@ Tab.prototype = {
     this.browser.lastURI = fixedURI;
 
     // Reset state of click-to-play plugin notifications.
     clearTimeout(this.pluginDoorhangerTimeout);
     this.pluginDoorhangerTimeout = null;
     this.shouldShowPluginDoorhanger = true;
     this.clickToPlayPluginsActivated = false;
 
-    // This is where we might check for helper apps.
-    // For now it is special cased to only check for the marketplace urls
-    if (WebappsUI.isMarketplace(aLocationURI)) {
-      // the marketplace app may not actually be installed, so instead we use a custom
-      // callback that will install and launch it for us if necessary
-      HelperApps.showDoorhanger(aLocationURI, function() {
-        WebappsUI.installAndLaunchMarketplace(aLocationURI.spec);
-        if (aRequest)
-          aRequest.cancel(Cr.NS_OK);
-      });
-    }
-
     let message = {
       gecko: {
         type: "Content:LocationChange",
         tabID: this.id,
         uri: fixedURI.spec,
         documentURI: documentURI,
         contentType: (contentType ? contentType : ""),
         sameDocument: sameDocument
@@ -6550,20 +6538,16 @@ var WebappsUI = {
     return iconURI ? iconURI.spec : DEFAULT_ICON;
   },
 
   doInstall: function doInstall(aData) {
     let manifest = new ManifestHelper(aData.app.manifest, aData.app.origin);
     let name = manifest.name ? manifest.name : manifest.fullLaunchPath();
     let showPrompt = true;
 
-    // skip showing the prompt if this is for the marketplace app
-    if (aData.app.origin == this.MARKETPLACE.URI.prePath)
-      showPrompt = false;
-
     if (!showPrompt || Services.prompt.confirm(null, Strings.browser.GetStringFromName("webapps.installTitle"), name)) {
       // Add a homescreen shortcut -- we can't use createShortcut, since we need to pass
       // a unique ID for Android webapp allocation
       this.makeBase64Icon(this.getBiggestIcon(manifest.icons, Services.io.newURI(aData.app.origin, null, null)),
         (function(scaledIcon, fullsizeIcon) {
           let profilePath = sendMessageToJava({
             gecko: {
               type: "WebApps:Install",