| Index: chrome/android/java/res/layout/main.xml
|
| diff --git a/chrome/android/java/res/layout/main.xml b/chrome/android/java/res/layout/main.xml
|
| index bd8c9a51ebc73dfbf38a06f44796f002bbf85f74..ab98289b346b663b96268da0fe8632b27a2c8767 100644
|
| --- a/chrome/android/java/res/layout/main.xml
|
| +++ b/chrome/android/java/res/layout/main.xml
|
| @@ -10,22 +10,32 @@
|
| android:layout_height="match_parent"
|
| android:orientation="vertical">
|
|
|
| - <org.chromium.chrome.browser.compositor.CompositorViewHolder
|
| - android:id="@+id/compositor_view_holder"
|
| + <android.support.design.widget.CoordinatorLayout
|
| + android:id="@+id/coordinator"
|
| android:layout_width="match_parent"
|
| android:layout_height="0dp"
|
| android:layout_weight="1" >
|
|
|
| + <org.chromium.chrome.browser.compositor.CompositorViewHolder
|
| + android:id="@+id/compositor_view_holder"
|
| + android:layout_width="match_parent"
|
| + android:layout_height="match_parent" />
|
| +
|
| <ViewStub
|
| android:id="@+id/omnibox_results_container_stub"
|
| android:layout_width="match_parent"
|
| android:layout_height="match_parent"
|
| android:layout_marginTop="@dimen/tab_strip_height"
|
| android:inflatedId="@+id/omnibox_results_container"
|
| - android:layout="@layout/omnibox_results_container"
|
| - app:layout_behavior="org.chromium.chrome.browser.compositor.CompositorViewHolderBehavior" />
|
| + android:layout="@layout/omnibox_results_container" />
|
| +
|
| + <FrameLayout
|
| + android:id="@+id/bottom_container"
|
| + android:layout_width="match_parent"
|
| + android:layout_height="match_parent"
|
| + android:layout_gravity="start|bottom" />
|
|
|
| - </org.chromium.chrome.browser.compositor.CompositorViewHolder>
|
| + </android.support.design.widget.CoordinatorLayout>
|
|
|
| <HorizontalScrollView
|
| android:id="@+id/keyboard_accessory"
|
|
|