🏡 Show correct BottomSheetContent toolbar when contents swapped

chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java

 // Copyright 2016 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.history;
 
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Rect;
 import android.net.Uri;
 import android.provider.Browser;
-import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 import android.support.graphics.drawable.VectorDrawableCompat;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.RecyclerView.OnScrollListener;
+import android.support.v7.widget.Toolbar;
 import android.support.v7.widget.Toolbar.OnMenuItemClickListener;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
-import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.IntentHandler;
-import org.chromium.chrome.browser.NativePage;
 import org.chromium.chrome.browser.document.ChromeLauncherActivity;
 import org.chromium.chrome.browser.favicon.LargeIconBridge;
 import org.chromium.chrome.browser.preferences.PreferencesLauncher;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.signin.SigninManager;
 import org.chromium.chrome.browser.signin.SigninManager.SignInStateObserver;
 import org.chromium.chrome.browser.snackbar.Snackbar;
 import org.chromium.chrome.browser.snackbar.SnackbarManager.SnackbarController;
 import org.chromium.chrome.browser.snackbar.SnackbarManager.SnackbarManageable;
 import org.chromium.chrome.browser.util.IntentUtils;
@@ skipping 14 matching lines @@
                                        SnackbarController {
     private static final int FAVICON_MAX_CACHE_SIZE_BYTES = 10 * 1024 * 1024; // 10MB
     private static final int MEGABYTES_TO_BYTES =  1024 * 1024;
     private static final String METRICS_PREFIX = "Android.HistoryPage.";
 
     private static HistoryProvider sProviderForTests;
 
     private final int mListItemLateralShadowSizePx;
 
     private final Activity mActivity;
-    private final boolean mIsDisplayedInNativePage;
+    private final boolean mIsFullscreenActivity;
     private final SelectableListLayout<HistoryItem> mSelectableListLayout;
     private final HistoryAdapter mHistoryAdapter;
     private final SelectionDelegate<HistoryItem> mSelectionDelegate;
     private final HistoryManagerToolbar mToolbar;
     private final TextView mEmptyView;
     private final RecyclerView mRecyclerView;
     private LargeIconBridge mLargeIconBridge;
 
     private boolean mIsSearching;
 
     /**
      * Creates a new HistoryManager.
      * @param activity The Activity associated with the HistoryManager.
+     * @param isFullscreenActivity Whether the history UI will be shown in a fullscreen activity.

[gone, 2017/03/15 17:21:15]

Ambiguous... Chrome Home is still inside a full screen activity

[Theresa, 2017/03/16 18:15:16]

Done. Changed this to "separate activity".

      */
-    @SuppressWarnings("unchecked")  // mSelectableListLayout
-    public HistoryManager(Activity activity, @Nullable NativePage nativePage) {
+    @SuppressWarnings("unchecked") // mSelectableListLayout
+    public HistoryManager(Activity activity, boolean isFullscreenActivity) {
         mActivity = activity;
-        mIsDisplayedInNativePage = nativePage != null;
+        mIsFullscreenActivity = isFullscreenActivity;
 
         mSelectionDelegate = new SelectionDelegate<>();
         mSelectionDelegate.addObserver(this);
         mHistoryAdapter = new HistoryAdapter(mSelectionDelegate, this,
                 sProviderForTests != null ? sProviderForTests : new BrowsingHistoryBridge());
 
         // 1. Create SelectableListLayout.
         mSelectableListLayout =
                 (SelectableListLayout<HistoryItem>) LayoutInflater.from(activity).inflate(
                         R.layout.history_main, null);
@@ skipping 60 matching lines @@
                 }
             }});
 
         // 9. Listen to changes in sign in state.
         SigninManager.get(mActivity).addSignInStateObserver(this);
 
         recordUserAction("Show");
     }
 
     /**
-     * @return Whether the history manager UI is displayed in a native page.
+     * @return Whether the history manager UI is displayed in a fullscreen activity.
      */
-    public boolean isDisplayedInNativePage() {
-        return mIsDisplayedInNativePage;
+    public boolean isDisplayedInFullScreenActivity() {
+        return mIsFullscreenActivity;
     }
 
     @Override
     public boolean onMenuItemClick(MenuItem item) {
         mToolbar.hideOverflowMenu();
 
-        if (item.getItemId() == R.id.close_menu_id && !isDisplayedInNativePage()) {
+        if (item.getItemId() == R.id.close_menu_id && isDisplayedInFullScreenActivity()) {
             mActivity.finish();
             return true;
         } else if (item.getItemId() == R.id.selection_mode_open_in_new_tab) {
             openItemsInNewTabs(mSelectionDelegate.getSelectedItems(), false);
             mSelectionDelegate.clearSelection();
             return true;
         } else if (item.getItemId() == R.id.selection_mode_copy_link) {
             recordUserActionWithOptionalSearch("CopyLink");
             Clipboard clipboard = new Clipboard(mActivity);
             clipboard.setText(mSelectionDelegate.getSelectedItems().get(0).getUrl());
@@ skipping 28 matching lines @@
     }
 
     /**
      * @return The view that shows the main browsing history UI.
      */
     public ViewGroup getView() {
         return mSelectableListLayout;
     }
 
     /**
-     * See {@link SelectableListLayout#detachContentView()}.
+     * See {@link SelectableListLayout#detachToolbarView()}.
      */
-    public View detachContentView() {
-        return mSelectableListLayout.detachContentView();
+    public Toolbar detachToolbarView() {
+        return mSelectableListLayout.detachToolbarView();
     }
 
     /**
      * @return The vertical scroll offset of the content view.
      */
     public int getVerticalScrollOffset() {
         return mRecyclerView.computeVerticalScrollOffset();
     }
 
     /**
@@ skipping 190 matching lines @@
     @Override
     public void onAction(Object actionData) {
         // Handler for the link copied snackbar. Do nothing.
     }
 
     @Override
     public void onDismissNoAction(Object actionData) {
         // Handler for the link copied snackbar. Do nothing.
     }
 }