summaryrefslogtreecommitdiff
path: root/chromium/chrome/browser/resources/settings/search_engines_page/search_engines_page.html
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/chrome/browser/resources/settings/search_engines_page/search_engines_page.html')
-rw-r--r--chromium/chrome/browser/resources/settings/search_engines_page/search_engines_page.html16
1 files changed, 12 insertions, 4 deletions
diff --git a/chromium/chrome/browser/resources/settings/search_engines_page/search_engines_page.html b/chromium/chrome/browser/resources/settings/search_engines_page/search_engines_page.html
index b58eb1f6dd7..a8bbfb697b3 100644
--- a/chromium/chrome/browser/resources/settings/search_engines_page/search_engines_page.html
+++ b/chromium/chrome/browser/resources/settings/search_engines_page/search_engines_page.html
@@ -1,15 +1,23 @@
-<link rel="import" href="chrome://resources/polymer/v0_8/polymer/polymer.html">
-<link rel="import" href="chrome://resources/polymer/v0_8/paper-material/paper-material.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/paper-material/paper-material.html">
<link rel="import" href="search_engine_adder.html">
+<link rel="import" href="search_engines_list.html">
<dom-module id="cr-settings-search-engines-page">
<link rel="import" type="css" href="chrome://md-settings/settings_page/settings_page.css">
+ <link rel="import" type="css" href="search_engines_page.css">
<template>
<paper-material>
<div class="content">
<cr-search-engine-adder></cr-search-engine-adder>
- <!-- TODO(orenb): Add search engine lists with defaultSearchEngines and
- otherSearchEngines. -->
+
+ <div class="list-label" i18n-content="searchEnginesLabel"></div>
+ <cr-search-engines-list engines="[[defaultEngines]]">
+ </cr-search-engines-list>
+
+ <div class="list-label" i18n-content="searchEnginesOtherLabel"></div>
+ <cr-search-engines-list engines="[[otherEngines]]">
+ </cr-search-engines-list>
</div>
</paper-material>
</template>