chrome/browser/resources/settings/search_page/search_page.html - Issue 2210583002: MD Settings: Associate suppages with the controls that trigger them.

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

Issue 2210583002: MD Settings: Associate suppages with the controls that trigger them. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Resolve conflicts with ToT Created 4 years, 4 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/privacy_page/privacy_page.html ('k') | chrome/browser/resources/settings/settings_page/settings_subpage.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.html">	1 <link rel="import" href="chrome://resources/html/polymer.html">

2 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">	2 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">

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

4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dropdown-menu/pap er-dropdown-menu.html">	4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dropdown-menu/pap er-dropdown-menu.html">

5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-listbox/paper-lis tbox.html">	5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-listbox/paper-lis tbox.html">

6 <link rel="import" href="/route.html">	6 <link rel="import" href="/route.html">

7 <link rel="import" href="/search_engines_page/search_engines_page.html">	7 <link rel="import" href="/search_engines_page/search_engines_page.html">

8 <link rel="import" href="/search_engines_page/search_engines_browser_proxy.html" >	8 <link rel="import" href="/search_engines_page/search_engines_browser_proxy.html" >

9 <link rel="import" href="/settings_page/settings_animated_pages.html">	9 <link rel="import" href="/settings_page/settings_animated_pages.html">

10 <link rel="import" href="/settings_page/settings_subpage.html">	10 <link rel="import" href="/settings_page/settings_subpage.html">

(...skipping 13 matching lines...) Expand all Loading...
24 selected="[[getSelectedSearchEngineIndex_(searchEngines_)]]"	24 selected="[[getSelectedSearchEngineIndex_(searchEngines_)]]"

25 on-iron-select="onIronSelect_">	25 on-iron-select="onIronSelect_">

26 <template is="dom-repeat" items="[[searchEngines_]]">	26 <template is="dom-repeat" items="[[searchEngines_]]">

27 <button class="dropdown-item" role="option">	27 <button class="dropdown-item" role="option">

28 [[item.name]]	28 [[item.name]]

29 </button>	29 </button>

30 </template>	30 </template>

31 </paper-listbox>	31 </paper-listbox>

32 </paper-dropdown-menu>	32 </paper-dropdown-menu>

33 </div>	33 </div>

34 <div class="settings-box">	34 <div id="subpage-trigger" class="settings-box">

35 <paper-button on-tap="onManageSearchEnginesTap_"	35 <paper-button on-tap="onManageSearchEnginesTap_"

36 class="primary-button">	36 class="primary-button">

37 $i18n{searchEnginesManage}	37 $i18n{searchEnginesManage}

38 </paper-button>	38 </paper-button>

39 </div>	39 </div>

40 </neon-animatable>	40 </neon-animatable>

41 <template is="dom-if" name="search-engines">	41 <template is="dom-if" name="search-engines">

42 <settings-subpage page-title="$i18n{searchEnginesManage}">	42 <settings-subpage

	43 associated-control="[[$$('#subpage-trigger')]]"

	44 page-title="$i18n{searchEnginesManage}">

43 <settings-search-engines-page></settings-search-engines-page>	45 <settings-search-engines-page></settings-search-engines-page>

44 </settings-subpage>	46 </settings-subpage>

45 </template>	47 </template>

46 </settings-animated-pages>	48 </settings-animated-pages>

47 </template>	49 </template>

48 <script src="search_page.js"></script>	50 <script src="search_page.js"></script>

49 </dom-module>	51 </dom-module>

OLD	NEW