[Android History] Styling changes

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

Index: chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManagerToolbar.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManagerToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManagerToolbar.java
index e50ae71127ffc3d45ddd8c118c6308e92e00cc20..605e510925ce237f1afb001c62ca357111254bca 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManagerToolbar.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManagerToolbar.java
@@ -5,6 +5,7 @@
 package org.chromium.chrome.browser.history;
 
 import android.content.Context;
+import android.graphics.Color;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -146,12 +147,14 @@ public class HistoryManagerToolbar extends SelectionToolbar<HistoryItem>
             mSearchView.setVisibility(View.VISIBLE);
             getMenu().setGroupVisible(mNormalGroupResId, false);
             setNavigationButton(NAVIGATION_BUTTON_BACK);
+            setBackgroundColor(Color.WHITE);

[gone, 2017/01/13 18:27:48]

Does this have to be undone in the above part of the conditional?

[Theresa, 2017/01/13 19:40:28]

Done. It was working, but as discussed offline it's better to be explicit about
it so I'm setting the background in hideSearchView() and showSearchView().

         }
     }
 
     @Override
     protected void onDataChanged(int numItems) {
-        getMenu().findItem(R.id.search_menu_id).setVisible(!mIsSearching && numItems != 0);
+        getMenu().findItem(R.id.search_menu_id).setVisible(
+                !mIsSelectionEnabled && !mIsSearching && numItems != 0);
     }
 
     @Override
@@ -205,7 +208,12 @@ public class HistoryManagerToolbar extends SelectionToolbar<HistoryItem>
     }
 
     @VisibleForTesting
-    Menu getMenuForTest() {
+    Menu getMenuForTests() {
         return getMenu();
     }
+
+    @VisibleForTesting
+    View getSearchViewForTests() {
+        return mSearchView;
+    }
 }