Extensions Docs Server: Samples search and icons

chrome/common/extensions/docs/server2/samples_data_source.py

Index: chrome/common/extensions/docs/server2/samples_data_source.py
diff --git a/chrome/common/extensions/docs/server2/samples_data_source.py b/chrome/common/extensions/docs/server2/samples_data_source.py
index c8e7fc4d0387711ede2e859a6181e8c34c64fce4..b07ed810fe07dca1972c4c51295d691da424441e 100644
--- a/chrome/common/extensions/docs/server2/samples_data_source.py
+++ b/chrome/common/extensions/docs/server2/samples_data_source.py
@@ -24,7 +24,11 @@ class SamplesDataSource(object):
     manifest_path = path + '/manifest.json'
     manifest = self._fetcher.Read([manifest_path]).Get()[manifest_path]
     manifest_json = json.loads(manifest)
-    return (manifest_json.get('name'), manifest_json.get('description'))
+    return {
+      'name': manifest_json.get('name'),
+      'description': manifest_json.get('description'),
+      'icon': manifest_json.get('icons', {}).get('128', None)
+    }
 
   def _MakeSamplesList(self, files):
     samples_list = []
@@ -55,14 +59,13 @@ class SamplesDataSource(object):
             'name': item,
             'link': self._MakeApiLink('method', item)
           })
-      name, description = self._GetDataFromManifest(sample_path)
-      samples_list.append({
-        'name': name,
-        'description': description,
+      samples_info = self._GetDataFromManifest(sample_path)
+      samples_info.update({
         'path': sample_path.split('/', 1)[1],
         'files': [f.replace(sample_path + '/', '') for f in sample_files],
         'api_calls': api_calls
       })
+      samples_list.append(samples_info)
     return samples_list
 
   def __getitem__(self, key):