Show the image header for the Context Menu

chrome/android/java/res/layout/tabular_context_menu_page.xml

Index: chrome/android/java/res/layout/tabular_context_menu_page.xml
diff --git a/chrome/android/java/res/layout/tabular_context_menu_page.xml b/chrome/android/java/res/layout/tabular_context_menu_page.xml
index fcf462960b64322e86f16e82a25fa787d33a4864..3c52ae04e98c9384d87e6ee9105d52178bf7d1db 100644
--- a/chrome/android/java/res/layout/tabular_context_menu_page.xml
+++ b/chrome/android/java/res/layout/tabular_context_menu_page.xml
@@ -2,27 +2,50 @@
 <!-- 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. -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/content_layer"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:minWidth="280dp"
     android:orientation="vertical">
-    <TextView
-        android:id="@+id/context_header_text"
+    <LinearLayout
+        android:id="@+id/context_header_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:layout_marginBottom="10dp"
         android:layout_marginStart="20dp"
         android:layout_marginEnd="20dp"
-        android:gravity="center"
-        android:maxLines="1"
-        android:textSize="13sp"
-        android:textStyle="bold"
-        android:ellipsize="end"
-        android:visibility="gone"/>
+        android:layout_marginBottom="10dp"
+        android:layout_gravity="center"
+        android:orientation="vertical"
+        tools:ignore="UseCompoundDrawables">
+        <!-- Cannot use a compound drawable since it does not allow a change in maxHeight and
+             background to the image. -->
+        <ImageView
+            android:id="@+id/context_header_image"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:contentDescription="@string/context_menu_header_image_default_desc_text"

[Ted C, 2017/03/31 16:19:32]

I think we shouldn't use a content description here either.  I would use @null. 
We could consider using a content description if there is an alt text on the
image to try and construct something that would be helpful to those visually
impaired, but here we're just saying it's an image so I think we should just
drop it.

[JJ, 2017/03/31 18:43:59]

Done.

+            android:foreground="@drawable/tabular_context_menu_image_border"
+            android:minWidth="@dimen/context_menu_header_image_min_size"
+            android:minHeight="@dimen/context_menu_header_image_min_size"
+            android:maxWidth="@dimen/context_menu_header_image_max_size"
+            android:maxHeight="@dimen/context_menu_header_image_max_size"
+            android:adjustViewBounds="true"
+            android:visibility="gone"/>
+        <TextView
+            android:id="@+id/context_header_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:maxLines="1"
+            android:textSize="13sp"
+            android:textStyle="bold"
+            android:ellipsize="end"
+            android:visibility="gone"/>
+    </LinearLayout>
     <View
         android:id="@+id/context_divider"
         android:layout_width="match_parent"