From 223606a63038871710df04c9e7dfd1db56424ce9 Mon Sep 17 00:00:00 2001
From: Mark Finkle <mfinkle@mozilla.com>
Date: Tue, 23 Oct 2012 01:36:09 -0400
Subject: [PATCH] Bug 802946 - Cleanup the 'Hide Apps/Promo' mess [backout the
 preprocessor code] r=blassey a=lsblakk

--HG--
rename : mobile/android/base/AboutHomeContent.java.in => mobile/android/base/AboutHomeContent.java
---
 ...outHomeContent.java.in => AboutHomeContent.java} | 13 -------------
 mobile/android/base/Makefile.in                     |  2 +-
 .../menu-large-v11/browser_app_menu.xml.in          |  5 -----
 .../base/resources/menu-v11/browser_app_menu.xml.in |  5 -----
 .../menu-xlarge-v11/browser_app_menu.xml.in         |  5 -----
 .../base/resources/menu/browser_app_menu.xml.in     |  4 ----
 6 files changed, 1 insertion(+), 33 deletions(-)
 rename mobile/android/base/{AboutHomeContent.java.in => AboutHomeContent.java} (97%)

diff --git a/mobile/android/base/AboutHomeContent.java.in b/mobile/android/base/AboutHomeContent.java
similarity index 97%
rename from mobile/android/base/AboutHomeContent.java.in
rename to mobile/android/base/AboutHomeContent.java
index 4391b9cd4ff6..15a231912ae9 100644
--- a/mobile/android/base/AboutHomeContent.java.in
+++ b/mobile/android/base/AboutHomeContent.java
@@ -227,19 +227,6 @@ public class AboutHomeContent extends ScrollView
         if (syncIsSetup && type == AboutHomePromoBox.Type.SYNC)
             type = AboutHomePromoBox.Type.APPS;
 
-// Remove the Apps promo from Beta and Release until we get go-ahead from Marketplace team.
-// Two blocks are silly, but the preprocessor does not support complex expressions and I
-// am not trying to make something elegant here. This code should disappear soon or the
-// entire feature should be removed.
-#if MOZ_UPDATE_CHANNEL == beta
-        if (type == AboutHomePromoBox.Type.APPS)
-            type = (syncIsSetup ? AboutHomePromoBox.Type.NONE : AboutHomePromoBox.Type.SYNC);
-#endif
-#if MOZ_UPDATE_CHANNEL == release
-        if (type == AboutHomePromoBox.Type.APPS)
-            type = (syncIsSetup ? AboutHomePromoBox.Type.NONE : AboutHomePromoBox.Type.SYNC);
-#endif
-
         mPromoBox.show(type);
     }
 
diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
index 304d97c6ffb3..f9e27a368620 100644
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -35,6 +35,7 @@ UTIL_JAVA_FILES := \
   $(NULL)
 
 FENNEC_JAVA_FILES = \
+  AboutHomeContent.java \
   AboutHomePromoBox.java \
   AboutHomeSection.java \
   ActivityHandlerHelper.java \
@@ -183,7 +184,6 @@ endif
 
 FENNEC_PP_JAVA_FILES = \
   App.java \
-  AboutHomeContent.java \
   MarketplaceApp.java \
   WebApp.java \
   WebApps.java \
diff --git a/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml.in b/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml.in
index f135789a4b78..bfe0cadcc8bc 100644
--- a/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml.in
+++ b/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml.in
@@ -49,14 +49,9 @@
                   android:icon="@drawable/ic_menu_addons"
                   android:title="@string/addons"/>
 
-#if MOZ_UPDATE_CHANNEL != beta
-#if MOZ_UPDATE_CHANNEL != release
             <item android:id="@+id/apps"
                   android:icon="@drawable/ic_menu_apps"
                   android:title="@string/apps"/>
-#endif
-#endif
-
         </menu>
 
     </item>
diff --git a/mobile/android/base/resources/menu-v11/browser_app_menu.xml.in b/mobile/android/base/resources/menu-v11/browser_app_menu.xml.in
index cf1f6ce3bb8b..08ef6d6a9fa9 100644
--- a/mobile/android/base/resources/menu-v11/browser_app_menu.xml.in
+++ b/mobile/android/base/resources/menu-v11/browser_app_menu.xml.in
@@ -50,14 +50,9 @@
                   android:icon="@drawable/ic_menu_addons"
                   android:title="@string/addons"/>
 
-#if MOZ_UPDATE_CHANNEL != beta
-#if MOZ_UPDATE_CHANNEL != release
             <item android:id="@+id/apps"
                   android:icon="@drawable/ic_menu_apps"
                   android:title="@string/apps"/>
-#endif
-#endif
-
         </menu>
 
     </item>
diff --git a/mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml.in b/mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml.in
index 421b8e5d1918..39f9bddf8189 100644
--- a/mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml.in
+++ b/mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml.in
@@ -50,14 +50,9 @@
                   android:icon="@drawable/ic_menu_addons"
                   android:title="@string/addons"/>
 
-#if MOZ_UPDATE_CHANNEL != beta
-#if MOZ_UPDATE_CHANNEL != release
             <item android:id="@+id/apps"
                   android:icon="@drawable/ic_menu_apps"
                   android:title="@string/apps"/>
-#endif
-#endif
-
         </menu>
 
     </item>
diff --git a/mobile/android/base/resources/menu/browser_app_menu.xml.in b/mobile/android/base/resources/menu/browser_app_menu.xml.in
index c82b1a1b4d04..c45d2fc080f9 100644
--- a/mobile/android/base/resources/menu/browser_app_menu.xml.in
+++ b/mobile/android/base/resources/menu/browser_app_menu.xml.in
@@ -38,12 +38,8 @@
     <item android:id="@+id/downloads"
           android:title="@string/downloads"/>
 
-#if MOZ_UPDATE_CHANNEL != beta
-#if MOZ_UPDATE_CHANNEL != release
     <item android:id="@+id/apps"
           android:title="@string/apps"/>
-#endif
-#endif
 
     <item android:id="@+id/char_encoding"
           android:visible="false"