chrome/browser/resources/settings/on_startup_page/on_startup_page.html - Issue 1347193003: Add cr-settings-radio-group wrapper

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

Issue 1347193003: Add cr-settings-radio-group wrapper (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Revert startup pages button change Created 5 years, 3 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/compiled_resources.gyp ('k') | chrome/browser/resources/settings/radio_group/compiled_resources.gyp » ('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/polymer/v1_0/polymer/polymer.html">	1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">

2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">	2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">

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="chrome://resources/polymer/v1_0/paper-radio-button/pape r-radio-button.html">	4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-button/pape r-radio-button.html">

5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-group/paper -radio-group.html">

6 <link rel="import" href="chrome://md-settings/on_startup_page/startup_urls_page. html">	5 <link rel="import" href="chrome://md-settings/on_startup_page/startup_urls_page. html">

	6 <link rel="import" href="chrome://md-settings/radio_group/radio_group.html">

7 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html">	7 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html">

8 <link rel="import" href="chrome://md-settings/settings_page/settings_subheader.h tml">	8 <link rel="import" href="chrome://md-settings/settings_page/settings_subheader.h tml">

9	9

10 <dom-module id="cr-settings-on-startup-page">	10 <dom-module id="cr-settings-on-startup-page">

11 <link rel="import" type="css"	11 <link rel="import" type="css"

12 href="chrome://md-settings/settings_page/settings_page.css">	12 href="chrome://md-settings/settings_page/settings_page.css">

13 <link rel="import" type="css" href="on_startup_shared.css">	13 <link rel="import" type="css" href="on_startup_shared.css">

14 <template>	14 <template>

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

16 section="on-startup">	16 section="on-startup">

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

18 <div id="locationLabel" i18n-content="onStartup"></div>	18 <div id="locationLabel" i18n-content="onStartup"></div>

19 <div>	19 <div>

20 <paper-radio-group	20 <cr-settings-radio-group pref="{{prefs.session.restore_on_startup}}">

21 selected="{{prefs.session.restore_on_startup.value}}">	21 <paper-radio-button name="[[prefValues_.OPEN_NEW_TAB]]"

22 <paper-radio-button

23 name="[[prefValues_.OPEN_NEW_TAB]]"

24 i18n-content="onStartupOpenNewTab">	22 i18n-content="onStartupOpenNewTab">

25 </paper-radio-button>	23 </paper-radio-button>

26 <paper-radio-button	24 <paper-radio-button name="[[prefValues_.CONTINUE]]"

27 name="[[prefValues_.CONTINUE]]"

28 i18n-content="onStartupContinue">	25 i18n-content="onStartupContinue">

29 </paper-radio-button>	26 </paper-radio-button>

30 <paper-radio-button	27 <paper-radio-button name="[[prefValues_.OPEN_SPECIFIC]]">

31 name="[[prefValues_.OPEN_SPECIFIC]]"	28 <span i18n-content="onStartupOpenSpecific"></span>

32 i18n-content="onStartupOpenSpecific">

33 </paper-radio-button>	29 </paper-radio-button>

34 </paper-radio-group>	30 </cr-settings-radio-group>

35 <paper-button	31 <paper-button

36 on-tap="onSetPagesTap_" raised i18n-content="onStartupSetPages">	32 on-tap="onSetPagesTap_" raised i18n-content="onStartupSetPages">

37 </paper-button>	33 </paper-button>

38 </div>	34 </div>

39 </neon-animatable>	35 </neon-animatable>

40 <neon-animatable id="startup-urls">	36 <neon-animatable id="startup-urls">

41 <settings-subheader i18n-values="page-title:onStartupSetPages">	37 <settings-subheader i18n-values="page-title:onStartupSetPages">

42 </settings-subheader>	38 </settings-subheader>

43 <cr-settings-startup-urls-page prefs="{{prefs}}">	39 <cr-settings-startup-urls-page prefs="{{prefs}}">

44 </cr-settings-startup-urls-page>	40 </cr-settings-startup-urls-page>

45 </neon-animatable>	41 </neon-animatable>

46 </cr-settings-animated-pages>	42 </cr-settings-animated-pages>

47 </template>	43 </template>

48 <script src="on_startup_page.js"></script>	44 <script src="on_startup_page.js"></script>

49 </dom-module>	45 </dom-module>

OLD	NEW