Merge branch 'backlog_1625-all-helpAndFeedback' into 'master'

Add-flag-to-control-video-playback-resume-feature.patch

Open-YouTube-links-in-Bromite.patch

Add-exit-menu-item.patch

Remove-help-menu-item.patch

AudioBuffer-AnalyserNode-fp-mitigations.patch

Multiple-fingerprinting-mitigations.patch

Add-flags-to-disable-device-motion-orientation-APIs.patch

From: csagan5 <32685696+csagan5@users.noreply.github.com>

Date: Wed, 27 Jun 2018 01:32:28 +0200

Subject: Remove help menu item

---

 chrome/android/java/res/menu/main_menu.xml               | 3 ---

 .../org/chromium/chrome/browser/KeyboardShortcuts.java   | 3 ---

 .../org/chromium/chrome/browser/app/ChromeActivity.java  | 9 ---------

 .../chrome/browser/customtabs/BaseCustomTabActivity.java | 2 +-

 .../browser/directactions/MenuDirectActionHandler.java   | 2 --

 5 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml

--- a/chrome/android/java/res/menu/main_menu.xml

+++ b/chrome/android/java/res/menu/main_menu.xml

@@ -114,9 +114,6 @@

         <item android:id="@+id/preferences_id"

             android:title="@string/menu_settings"

             android:icon="@drawable/settings_cog" />

-        <item android:id="@+id/help_id"

-            android:title="@string/menu_help"

-            android:icon="@drawable/help_outline" />

         <item android:id="@+id/enter_vr_id"

             android:title="@string/enter_vr"

             android:icon="@drawable/vr_headset" />

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java

@@ -343,9 +343,6 @@ public class KeyboardShortcuts {

                     tab = activity.getActivityTab();

                     if (tab != null && tab.canGoForward()) tab.goForward();

                     return true;

-                case CTRL | SHIFT | KeyEvent.KEYCODE_SLASH:  // i.e. Ctrl+?

-                    activity.onMenuOrKeyboardAction(R.id.help_id, false);

-                    return true;

             }

         }

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

@@ -2142,15 +2142,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

         final Tab currentTab = getActivityTab();

-        if (id == R.id.help_id) {

-            String url = currentTab != null ? currentTab.getUrlString() : "";

-            Profile profile = getTabModelSelector().isIncognitoSelected()

-                    ? Profile.getLastUsedRegularProfile().getPrimaryOTRProfile()

-                    : Profile.getLastUsedRegularProfile();

-            startHelpAndFeedback(url, "MobileMenuFeedback", profile);

-            return true;

-        }

-

         if (id == R.id.open_history_menu_id) {

             // 'currentTab' could only be null when opening history from start surface, which is

             // not available on tablet.

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java

@@ -497,7 +497,7 @@ public abstract class BaseCustomTabActivity extends ChromeActivity<BaseCustomTab

     @Override

     public boolean onMenuOrKeyboardAction(int id, boolean fromMenu) {

         // Disable creating new tabs, bookmark, history, print, help, focus_url, etc.

-        if (id == R.id.focus_url_bar || id == R.id.all_bookmarks_menu_id || id == R.id.help_id

+        if (id == R.id.focus_url_bar || id == R.id.all_bookmarks_menu_id

                 || id == R.id.recent_tabs_menu_id || id == R.id.new_incognito_tab_menu_id

                 || id == R.id.new_tab_menu_id || id == R.id.open_history_menu_id) {

             return true;

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/directactions/MenuDirectActionHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/directactions/MenuDirectActionHandler.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/directactions/MenuDirectActionHandler.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/directactions/MenuDirectActionHandler.java

@@ -36,7 +36,6 @@ class MenuDirectActionHandler implements DirectActionHandler {

         map.put(ChromeDirectActionIds.RELOAD, R.id.reload_menu_id);

         map.put(ChromeDirectActionIds.BOOKMARK_THIS_PAGE, R.id.bookmark_this_page_id);

         map.put(ChromeDirectActionIds.DOWNLOADS, R.id.downloads_menu_id);

-        map.put(ChromeDirectActionIds.HELP, R.id.help_id);

         map.put(ChromeDirectActionIds.NEW_TAB, R.id.new_tab_menu_id);

         map.put(ChromeDirectActionIds.OPEN_HISTORY, R.id.open_history_menu_id);

         map.put(ChromeDirectActionIds.PREFERENCES, R.id.preferences_id);

@@ -92,7 +91,6 @@ class MenuDirectActionHandler implements DirectActionHandler {

         }

         availableItemIds.add(R.id.downloads_menu_id);

-        availableItemIds.add(R.id.help_id);

         availableItemIds.add(R.id.new_tab_menu_id);

         availableItemIds.add(R.id.preferences_id);

-- 

2.17.1