Speculative fix for BadWindowToken when showing app menu.

BUG=844787

Change-Id: I966b385a928075c25eebdb7abfbdbbfb0ab2db95
Reviewed-on: https://chromium-review.googlesource.com/1067477Reviewed-by: Theresa <twellington@chromium.org>
Commit-Queue: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#560299}

chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

@@ -1418,7 +1418,12 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
     /**
      * @return Whether the app menu should be shown.
      */
+    @CallSuper
     public boolean shouldShowAppMenu() {
+        if (isActivityDestroyed()) return false;
+
+        if (ApplicationStatus.getStateForActivity(this) != ActivityState.RESUMED) return false;
+
         // Do not show the menu if Contextual Search panel is opened.
         if (mContextualSearchManager != null && mContextualSearchManager.isSearchPanelOpened()) {
             return false;

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java

@@ -989,7 +989,9 @@ public class CustomTabActivity extends ChromeActivity {
 
     @Override
     public boolean shouldShowAppMenu() {
-        return getActivityTab() != null && getToolbarManager().isInitialized();
+        if (getActivityTab() == null || !getToolbarManager().isInitialized()) return false;
+
+        return super.shouldShowAppMenu();
     }
 
     @Override