chrome/browser/resources/settings/search_engines_page/search_engines_page.html - Issue 1666623006: MD Settings: Manage search engines 3/3, hooking up UI.

Side by Side Diff: chrome/browser/resources/settings/search_engines_page/search_engines_page.html

Issue 1666623006: MD Settings: Manage search engines 3/3, hooking up UI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@manage_search_engines_handler

Patch Set: Resolving conflicts with ToT Created 4 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « chrome/browser/resources/settings/search_engines_page/search_engines_list.css ('k') | chrome/browser/resources/settings/search_engines_page/search_engines_page.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
	1 <link rel="import" href="chrome://resources/html/polymer_config.html">

1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">	2 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">

	3 <link rel="import" href="chrome://resources/html/cr.html">

2 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html">	4 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html">

3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html">	5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html">

4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">	6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">

5 <link rel="import" href="chrome://md-settings/search_engines_page/add_search_eng ine_dialog.html">	7 <link rel="import" href="chrome://md-settings/search_engines_page/search_engines _browser_proxy.html">

	8 <link rel="import" href="chrome://md-settings/search_engines_page/search_engine_ dialog.html">

6 <link rel="import" href="chrome://md-settings/search_engines_page/search_engines _list.html">	9 <link rel="import" href="chrome://md-settings/search_engines_page/search_engines _list.html">

7 <link rel="import" href="chrome://md-settings/reset_page/reset_profile_dialog.ht ml">

8	10

9 <dom-module id="settings-search-engines-page">	11 <dom-module id="settings-search-engines-page">

10 <link rel="import" type="css" href="chrome://md-settings/settings_shared.css">	12 <link rel="import" type="css" href="chrome://md-settings/settings_shared.css">

11 <template>	13 <template>

12 <style>	14 <style>

13 .other-label-container {	15 .other-label-container {

14 display: flex;	16 display: flex;

15 }	17 }

16	18

17 .other-label-container span {	19 .other-label-container span {

18 flex: 1;	20 flex: 1;

19 }	21 }

20 </style>	22 </style>

21 <div class="settings-box block">	23 <div class="settings-box block">

22 <settings-search-engines-list engines="[[defaultEngines]]">	24 <settings-search-engines-list engines="[[defaultEngines]]">

23 </settings-search-engines-list>	25 </settings-search-engines-list>

24 </div>	26 </div>

25 <div class="settings-box">	27 <div class="settings-box">

26 <paper-button class="link-button"	28 <paper-button class="link-button"

27 i18n-content="searchEnginesAddSearchEngineLabel"	29 i18n-content="searchEnginesAddSearchEngineLabel"

28 on-tap="onAddSearchEngineTap_"></paper-button>	30 on-tap="onAddSearchEngineTap_" id="addSearchEngine"></paper-button>

29 </div>	31 </div>

30 <template is="dom-if" if="[[showAddSearchEngineDialog_]]" restamp>	32 <template is="dom-if" if="[[showAddSearchEngineDialog_]]" restamp>

31 <settings-add-search-engine-dialog></settings-add-search-engine-dialog>	33 <settings-search-engine-dialog></settings-search-engine-dialog>

32 </template>	34 </template>

33 <div class="settings-box block">	35 <div class="settings-box block">

34 <div class="other-label-container">	36 <div class="other-label-container">

35 <span i18n-content="searchEnginesOtherLabel"></span>	37 <span i18n-content="searchEnginesOtherLabel"></span>

36 <cr-expand-button expanded="{{otherSearchEnginesExpanded}}">	38 <cr-expand-button expanded="{{otherSearchEnginesExpanded_}}">

37 </cr-expand-button>	39 </cr-expand-button>

38 </div>	40 </div>

39	41

40 <iron-collapse id="collapse" opened=[[otherSearchEnginesExpanded]]>	42 <iron-collapse id="collapse" opened=[[otherSearchEnginesExpanded_]]>

41 <settings-search-engines-list engines="[[otherEngines]]">	43 <settings-search-engines-list engines="[[otherEngines]]">

42 </settings-search-engines-list>	44 </settings-search-engines-list>

43 </iron-collapse>	45 </iron-collapse>

44 </div>	46 </div>

45 </template>	47 </template>

46 <script src="search_engines_page.js"></script>	48 <script src="search_engines_page.js"></script>

47 </dom-module>	49 </dom-module>

OLD	NEW