Upstream oodles of Chrome for Android code into Chromium.

chrome/android/java_staging/res/layout/eb_search_core.xml

Index: chrome/android/java_staging/res/layout/eb_search_core.xml
diff --git a/chrome/android/java_staging/res/layout/eb_search_core.xml b/chrome/android/java_staging/res/layout/eb_search_core.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cf942b829e4b3d69890b3b872058fa85aaf0158d
--- /dev/null
+++ b/chrome/android/java_staging/res/layout/eb_search_core.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 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. -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
+        android:id="@+id/title_holder"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/toolbar_height_no_shadow"
+        android:orientation="horizontal"
+        android:descendantFocusability="afterDescendants" >
+
+        <ImageButton
+            android:id="@+id/eb_search_back"
+            android:layout_width="@dimen/toolbar_height_no_shadow"
+            android:layout_height="match_parent"
+            android:background="?attr/listChoiceBackgroundIndicator"
+            android:contentDescription="@string/accessibility_toolbar_btn_back"
+            android:padding="15dp"
+            android:src="@drawable/eb_back_normal" />
+
+        <EditText
+            android:id="@+id/eb_search_text"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@null"
+            android:gravity="center_vertical"
+            android:hint="@string/enhanced_bookmark_action_bar_search"
+            android:imeOptions="flagNoExtractUi|actionDone"
+            android:inputType="text"
+            android:singleLine="true"
+            android:textColor="#343434"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="#E1E1E1" />
+
+    <view class="org.chromium.chrome.browser.enhancedbookmarks.EnhancedBookmarkSearchView$HistoryResultSwitcher"
+        android:id="@+id/history_result_switcher"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:inAnimation="@android:anim/fade_in"
+        android:outAnimation="@android:anim/fade_out" >
+
+        <ListView
+            android:id="@+id/eb_history_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:divider="@null"
+            android:dividerHeight="0dp" />
+
+        <ViewSwitcher
+            android:id="@+id/result_empty_switcher"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:inAnimation="@android:anim/fade_in"
+            android:outAnimation="@android:anim/fade_out" >
+
+            <ListView
+                android:id="@+id/eb_result_list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:divider="@null"
+                android:dividerHeight="0dp" />
+
+            <TextView
+                android:id="@+id/eb_search_empty_view"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:drawablePadding="3dp"
+                android:drawableTop="@drawable/eb_logo_large"
+                android:gravity="center"
+                android:padding="16dp"
+                android:text="@string/enhanced_bookmark_no_result"
+                android:textColor="#5B5B5B"
+                android:textSize="16sp" />
+        </ViewSwitcher>
+    </view>
+
+</merge>