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

Side by Side Diff: chrome/browser/resources/settings/internet_page/internet_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/device_page/device_page.html ('k') | chrome/browser/resources/settings/languages_page/languages_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/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/cr_elements/network/cr_onc_types.htm l">	3 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l">

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

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

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

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

8 <link rel="import" href="internet_detail_page.html">	8 <link rel="import" href="internet_detail_page.html">

9 <link rel="import" href="internet_known_networks_page.html">	9 <link rel="import" href="internet_known_networks_page.html">

10 <link rel="import" href="network_summary.html">	10 <link rel="import" href="network_summary.html">

11	11

12 <dom-module id="settings-internet-page">	12 <dom-module id="settings-internet-page">

13 <template>	13 <template>

14 <style include="settings-shared"></style>	14 <style include="settings-shared"></style>

15 <settings-animated-pages id="pages" current-route="{{currentRoute}}"	15 <settings-animated-pages id="pages" current-route="{{currentRoute}}"

16 section="internet">	16 section="internet">

17 <neon-animatable id="main">	17 <neon-animatable id="main">

18 <network-summary on-show-detail="onShowDetail_"	18 <network-summary on-show-detail="onShowDetail_"

19 default-network="{{defaultNetwork}}"	19 default-network="{{defaultNetwork}}"

20 on-show-known-networks="onShowKnownNetworks_"	20 on-show-known-networks="onShowKnownNetworks_"

21 networking-private="[[networkingPrivate]]">	21 networking-private="[[networkingPrivate]]">

22 </network-summary>	22 </network-summary>

23 </neon-animatable>	23 </neon-animatable>

24 <template is="dom-if" name="network-detail">	24 <template is="dom-if" name="network-detail">

25 <settings-subpage page-title="$i18n{internetDetailPageTitle}">	25 <settings-subpage no-associated-control

	26 page-title="$i18n{internetDetailPageTitle}">

26 <settings-internet-detail-page	27 <settings-internet-detail-page

27 guid="[[detailGuid]]"	28 guid="[[detailGuid]]"

28 default-network="[[defaultNetwork]]"	29 default-network="[[defaultNetwork]]"

29 networking-private="[[networkingPrivate]]">	30 networking-private="[[networkingPrivate]]">

30 </settings-internet-detail-page>	31 </settings-internet-detail-page>

31 </settings-subpage>	32 </settings-subpage>

32 </template>	33 </template>

33 <template is="dom-if" name="known-networks">	34 <template is="dom-if" name="known-networks">

34 <settings-subpage page-title="$i18n{internetKnownNetworksPageTitle}">	35 <settings-subpage no-associated-control

	36 page-title="$i18n{internetKnownNetworksPageTitle}">

35 <settings-internet-known-networks-page	37 <settings-internet-known-networks-page

36 network-type="[[knownNetworksType]]"	38 network-type="[[knownNetworksType]]"

37 on-show-detail="onShowDetail_"	39 on-show-detail="onShowDetail_"

38 networking-private="[[networkingPrivate]]">	40 networking-private="[[networkingPrivate]]">

39 </settings-internet-known-networks-page>	41 </settings-internet-known-networks-page>

40 </settings-subpage>	42 </settings-subpage>

41 </template>	43 </template>

42 </settings-animated-pages>	44 </settings-animated-pages>

43 </template>	45 </template>

44 <script src="internet_page.js"></script>	46 <script src="internet_page.js"></script>

45 </dom-module>	47 </dom-module>

OLD	NEW