Clean up tinted ImageView subclasses

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.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.customtabs;
 
 import android.view.Menu;
 import android.view.MenuItem;
 
 import org.chromium.base.VisibleForTesting;
@@ skipping 64 matching lines @@
                 ShareHelper.configureDirectShareMenuItem(
                         mActivity, menu.findItem(R.id.direct_share_menu_id));
             }
 
             MenuItem iconRow = menu.findItem(R.id.icon_row_menu_id);
             MenuItem openInChromeItem = menu.findItem(R.id.open_in_browser_id);
             MenuItem bookmarkItem = menu.findItem(R.id.bookmark_this_page_id);
             MenuItem downloadItem = menu.findItem(R.id.offline_page_id);
 
             boolean addToHomeScreenVisible = true;
-
-            // Hide request desktop site on all chrome:// pages except for the NTP. Check request
-            // desktop site if it's activated on this page.
-            MenuItem requestItem = menu.findItem(R.id.request_desktop_site_id);
-            updateRequestDesktopSiteMenuItem(requestItem, currentTab);
+            updateRequestDesktopSiteMenuItem(menu, currentTab);
 
             if (mIsMediaViewer) {
                 // Most of the menu items don't make sense when viewing media.
                 iconRow.setVisible(false);
                 openInChromeItem.setVisible(false);
                 menu.findItem(R.id.find_in_page_id).setVisible(false);
-                menu.findItem(R.id.request_desktop_site_id).setVisible(false);
+                menu.findItem(R.id.request_desktop_site_row_menu_id).setVisible(false);
                 addToHomeScreenVisible = false;
             } else if (mIsPaymentRequestUI) {
                 // Only the icon row and 'find in page' are shown for openning payment request UI
                 // from Chrome.
                 openInChromeItem.setVisible(false);
                 menu.findItem(R.id.request_desktop_site_id).setVisible(false);
                 addToHomeScreenVisible = false;
             } else {
                 openInChromeItem.setTitle(
                         DefaultBrowserInfo.getTitleOpenInDefaultBrowser(mIsOpenedByChrome));
@@ skipping 51 matching lines @@
      * the same title, a random one will be returned. This method is for testing purpose _only_.
      */
     @VisibleForTesting
     MenuItem getMenuItemForTitle(String title) {
         for (MenuItem item : mItemToIndexMap.keySet()) {
             if (item.getTitle().equals(title)) return item;
         }
         return null;
     }
 }