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

Side by Side Diff: chrome/browser/resources/settings/printing_page/printing_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/people_page/people_page.html ('k') | chrome/browser/resources/settings/privacy_page/privacy_page.html » ('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/iron-icon/iron-icon.htm l">	2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l">

3 <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/neon-animation/neon-ani matable.html">

4 <link rel="import" href="/icons.html">	4 <link rel="import" href="/icons.html">

5 <link rel="import" href="/printing_page/cloud_printers.html">	5 <link rel="import" href="/printing_page/cloud_printers.html">

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

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

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

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

10 <if expr="chromeos">	10 <if expr="chromeos">

(...skipping 18 matching lines...) Expand all Loading...
29 </div>	29 </div>

30 </if>	30 </if>

31 <div id="cloudPrinters" class="settings-box"	31 <div id="cloudPrinters" class="settings-box"

32 on-tap="onTapCloudPrinters_" actionable>	32 on-tap="onTapCloudPrinters_" actionable>

33 <iron-icon icon="settings:cloud-printing"></iron-icon>	33 <iron-icon icon="settings:cloud-printing"></iron-icon>

34 <div class="middle">$i18n{cloudPrintersTitle}</div>	34 <div class="middle">$i18n{cloudPrintersTitle}</div>

35 </div>	35 </div>

36 </neon-animatable>	36 </neon-animatable>

37 <if expr="chromeos">	37 <if expr="chromeos">

38 <template is="dom-if" name="cups-printers">	38 <template is="dom-if" name="cups-printers">

39 <settings-subpage page-title="$i18n{cupsPrintersTitle}">	39 <settings-subpage

	40 associated-control="[[$$('#cupsPrinters')]]"

	41 page-title="$i18n{cupsPrintersTitle}">

40 <settings-cups-printers printers="{{cupsPrinters}}">	42 <settings-cups-printers printers="{{cupsPrinters}}">

41 </settings-cups-printers>	43 </settings-cups-printers>

42 </settings-subpage>	44 </settings-subpage>

43 </template>	45 </template>

44 <template is="dom-if" name="cups-printer-details-page" restamp>	46 <template is="dom-if" name="cups-printer-details-page" restamp>

45 <settings-subpage page-title="$i18n{printerDetailsTitle}">	47 <settings-subpage no-associated-control

	48 page-title="$i18n{printerDetailsTitle}">

46 <settings-cups-printer-details-page printer="{{detailPrinter_}}">	49 <settings-cups-printer-details-page printer="{{detailPrinter_}}">

47 </settings-cups-printer-details-page>	50 </settings-cups-printer-details-page>

48 </settings-subpage>	51 </settings-subpage>

49 </template>	52 </template>

50 </if>	53 </if>

51 <template is="dom-if" name="cloud-printers">	54 <template is="dom-if" name="cloud-printers">

52 <settings-subpage page-title="$i18n{cloudPrintersTitle}">	55 <settings-subpage

	56 associated-control="[[$$('#cloudPrinters')]]"

	57 page-title="$i18n{cloudPrintersTitle}">

53 <settings-cloud-printers prefs="{{prefs}}">	58 <settings-cloud-printers prefs="{{prefs}}">

54 </settings-cloud-printers>	59 </settings-cloud-printers>

55 </settings-subpage>	60 </settings-subpage>

56 </template>	61 </template>

57 </settings-animated-pages>	62 </settings-animated-pages>

58 </template>	63 </template>

59 <script src="printing_page.js"></script>	64 <script src="printing_page.js"></script>

60 </dom-module>	65 </dom-module>

OLD	NEW