Launch "Update Chrome" menu item

chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.omaha;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
@@ skipping 27 matching lines @@
 /**
  * Contains logic for whether the update menu item should be shown, whether the update toolbar badge
  * should be shown, and UMA logging for the update menu item.
  */
 public class UpdateMenuItemHelper {
     private static final String TAG = "UpdateMenuItemHelper";
 
     // VariationsAssociatedData configs
     private static final String FIELD_TRIAL_NAME = "UpdateMenuItem";
     private static final String ENABLED_VALUE = "true";
-    private static final String ENABLE_UPDATE_MENU_ITEM = "enable_update_menu_item";
-    private static final String ENABLE_UPDATE_BADGE = "enable_update_badge";
-    private static final String SHOW_SUMMARY = "show_summary";
-    private static final String USE_NEW_FEATURES_SUMMARY = "use_new_features_summary";
     private static final String CUSTOM_SUMMARY = "custom_summary";
 
     // UMA constants for logging whether the menu item was clicked.
     private static final int ITEM_NOT_CLICKED = 0;
     private static final int ITEM_CLICKED_INTENT_LAUNCHED = 1;
     private static final int ITEM_CLICKED_INTENT_FAILED = 2;
     private static final int ITEM_CLICKED_BOUNDARY = 3;
 
     // UMA constants for logging whether Chrome was updated after the menu item was clicked.
     private static final int UPDATED = 0;
@@ skipping 32 matching lines @@
             }
             return sInstance;
         }
     }
 
     /**
      * Checks if the {@link OmahaClient} knows about an update.
      * @param activity The current {@link ChromeActivity}.
      */
     public void checkForUpdateOnBackgroundThread(final ChromeActivity activity) {
-        if (!getBooleanParam(ENABLE_UPDATE_MENU_ITEM)
-                && !getBooleanParam(ChromeSwitches.FORCE_SHOW_UPDATE_MENU_ITEM)
-                && !getBooleanParam(ChromeSwitches.FORCE_SHOW_UPDATE_MENU_BADGE)) {
-            return;
-        }
-
         ThreadUtils.assertOnUiThread();
 
         if (mAlreadyCheckedForUpdates) {
             if (activity.isActivityDestroyed()) return;
             activity.onCheckForUpdate(mUpdateAvailable);
             return;
         }
 
         mAlreadyCheckedForUpdates = true;
 
@@ skipping 33 matching lines @@
 
     /**
      * @param activity The current {@link ChromeActivity}.
      * @return Whether the update menu item should be shown.
      */
     public boolean shouldShowMenuItem(ChromeActivity activity) {
         if (getBooleanParam(ChromeSwitches.FORCE_SHOW_UPDATE_MENU_ITEM)) {
             return true;
         }
 
-        if (!getBooleanParam(ENABLE_UPDATE_MENU_ITEM)) {
-            return false;
-        }
-
         return updateAvailable(activity);
     }
 
     /**
      * @param context The current {@link Context}.
      * @return The string to use for summary text or the empty string if no summary should be shown.
      */
     public String getMenuItemSummaryText(Context context) {
-        if (!getBooleanParam(SHOW_SUMMARY) && !getBooleanParam(USE_NEW_FEATURES_SUMMARY)
-                && !getBooleanParam(CUSTOM_SUMMARY)) {
-            return "";
-        }
-
         String customSummary = getStringParamValue(CUSTOM_SUMMARY);
         if (!TextUtils.isEmpty(customSummary)) {
             return customSummary;
         }
 
-        if (getBooleanParam(USE_NEW_FEATURES_SUMMARY)) {
-            return context.getResources().getString(R.string.menu_update_summary_new_features);
-        }
-
         return context.getResources().getString(R.string.menu_update_summary_default);
     }
 
     /**
      * @param activity The current {@link ChromeActivity}.
      * @return Whether the update badge should be shown in the toolbar.
      */
     public boolean shouldShowToolbarBadge(ChromeActivity activity) {
         if (getBooleanParam(ChromeSwitches.FORCE_SHOW_UPDATE_MENU_BADGE)) {
             return true;
         }
 
         // The badge is hidden if the update menu item has been clicked until there is an
         // even newer version of Chrome available.
         String latestVersionWhenClicked =
                 PrefServiceBridge.getInstance().getLatestVersionWhenClickedUpdateMenuItem();
-        if (!getBooleanParam(ENABLE_UPDATE_BADGE)
-                || TextUtils.equals(latestVersionWhenClicked, mLatestVersion)) {
+        if (TextUtils.equals(latestVersionWhenClicked, mLatestVersion)) {
             return false;
         }
 
         return updateAvailable(activity);
     }
 
     /**
      * Handles a click on the update menu item.
      * @param activity The current {@link ChromeActivity}.
      */
@@ skipping 195 matching lines @@
         return statFs.getAvailableBytes() / (1024 * 1024);
     }
 
     @SuppressWarnings("deprecation")
     private static long getSize(StatFs statFs) {
         int blockSize = statFs.getBlockSize();
         int availableBlocks = statFs.getAvailableBlocks();
         return (blockSize * availableBlocks) / (1024 * 1024);
     }
 }