🔍 Move WindowAndroid knowledge up to the base class

chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java

 // Copyright 2017 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.searchwidget;
 
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Handler;
 import android.support.customtabs.CustomTabsIntent;
@@ skipping 17 matching lines @@
 import org.chromium.chrome.browser.snackbar.SnackbarManager.SnackbarManageable;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabDelegateFactory;
 import org.chromium.chrome.browser.tab.TabIdManager;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
 import org.chromium.chrome.browser.util.IntentUtils;
 import org.chromium.components.url_formatter.UrlFormatter;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.ui.base.ActivityWindowAndroid;
 
-/** Prototype that queries the user's default search engine and shows autocomplete suggestions. */
+/** Queries the user's default search engine and shows autocomplete suggestions. */
 public class SearchActivity extends AsyncInitializationActivity
         implements SnackbarManageable, SearchActivityLocationBarLayout.Delegate,
                    View.OnLayoutChangeListener {
 
     /** Main content view. */
     private ViewGroup mContentView;
 
     /** Whether the native library has been loaded. */
     private boolean mIsNativeReady;
 
     /** Input submitted before before the native library was loaded. */
     private String mQueuedUrl;
 
     /** The View that represents the search box. */
     private SearchActivityLocationBarLayout mSearchBox;
 
-    private ActivityWindowAndroid mWindowAndroid;
     private SnackbarManager mSnackbarManager;
     private SearchBoxDataProvider mSearchBoxDataProvider;
     private Tab mTab;
 
     @Override
     public void backKeyPressed() {
         cancelSearch();
     }
 
     @Override
     protected boolean shouldDelayBrowserStartup() {
         return true;
     }
 
     @Override
-    public boolean onActivityResultWithNative(int requestCode, int resultCode, Intent intent) {
-        if (super.onActivityResultWithNative(requestCode, resultCode, intent)) return true;
-        return mWindowAndroid.onActivityResult(requestCode, resultCode, intent);
-    }
-
-    @Override
-    public void onRequestPermissionsResult(
-            int requestCode, String[] permissions, int[] grantResults) {
-        // TODO(dfalcantara): This is from ChromeWindow.  It should be moved into the
-        //                    AsyncInitializationActivity, but that has a lot of subclasses that
-        //                    don't need a WindowAndroid.
-        if (mWindowAndroid != null) {
-            if (mWindowAndroid.onRequestPermissionsResult(requestCode, permissions, grantResults)) {
-                return;
-            }
-        }
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+    protected ActivityWindowAndroid createWindowAndroid() {
+        return new ActivityWindowAndroid(this);
     }
 
     @Override
     protected void setContentView() {
-        mWindowAndroid = new ActivityWindowAndroid(this);
         mSnackbarManager = new SnackbarManager(this, null);
         mSearchBoxDataProvider = new SearchBoxDataProvider();
 
         mContentView = createContentView();
 
         // Build the search box.
         mSearchBox = (SearchActivityLocationBarLayout) mContentView.findViewById(
                 R.id.search_location_bar);
         mSearchBox.setDelegate(this);
         mSearchBox.setToolbarDataProvider(mSearchBoxDataProvider);
-        mSearchBox.initializeControls(new WindowDelegate(getWindow()), mWindowAndroid);
+        mSearchBox.initializeControls(new WindowDelegate(getWindow()), getWindowAndroid());
 
         setContentView(mContentView);
     }
 
     @Override
     public void finishNativeInitialization() {
         super.finishNativeInitialization();
         mIsNativeReady = true;
 
         mTab = new Tab(TabIdManager.getInstance().generateValidId(Tab.INVALID_TAB_ID),
-                Tab.INVALID_TAB_ID, false, this, mWindowAndroid, TabLaunchType.FROM_EXTERNAL_APP,
-                null, null);
+                Tab.INVALID_TAB_ID, false, this, getWindowAndroid(),
+                TabLaunchType.FROM_EXTERNAL_APP, null, null);
         mTab.initialize(WebContentsFactory.createWebContents(false, false), null,
                 new TabDelegateFactory(), false, false);
         mTab.loadUrl(new LoadUrlParams("about:blank"));
 
         mSearchBoxDataProvider.onNativeLibraryReady(mTab);
         mSearchBox.onNativeLibraryReady();
 
         if (mQueuedUrl != null) loadUrl(mQueuedUrl);
 
         new Handler().post(new Runnable() {
@@ skipping 117 matching lines @@
         });
         ChromeBrowserInitializer.getInstance(getApplicationContext())
                 .handlePreNativeStartup(SearchActivity.this);
     }
 
     private void cancelSearch() {
         finish();
         overridePendingTransition(0, R.anim.activity_close_exit);
     }
 }