chrome/browser/resources/settings/sync_page/sync_page.html - Issue 1346823005: Elim cr_button from md-settings

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

Issue 1346823005: Elim cr_button from md-settings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 5 years, 2 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/settings_page/settings_page.css ('k') | chrome/browser/resources/settings/users_page/user_list.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/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/paper-button/paper-butt on.html">

2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html">	3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html">

3 <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">

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

5 <link rel="import" href="chrome://resources/cr_elements/v1_0/cr_button/cr_button .html">

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

7	7

8 <dom-module id="cr-settings-sync-page">	8 <dom-module id="cr-settings-sync-page">

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

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

11 <link rel="import" type="css" href="sync_page.css">	11 <link rel="import" type="css" href="sync_page.css">

12 <template>	12 <template>

13 <div i18n-content="syncPageTitle"></div>	13 <div i18n-content="syncPageTitle"></div>

14 <select>	14 <select>

15 <option value="sync-everything"	15 <option value="sync-everything"

(...skipping 42 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
58 <div i18n-content="syncDataEncryptedText"></div>	58 <div i18n-content="syncDataEncryptedText"></div>

59 <paper-radio-group selected="encrypt-with-google">	59 <paper-radio-group selected="encrypt-with-google">

60 <paper-radio-button name="encrypt-with-google"	60 <paper-radio-button name="encrypt-with-google"

61 i18n-content="encryptWithGoogleCredentialsLabel">	61 i18n-content="encryptWithGoogleCredentialsLabel">

62 </paper-radio-button>	62 </paper-radio-button>

63 <paper-radio-button name="encrypt-with-passphrase"	63 <paper-radio-button name="encrypt-with-passphrase"

64 i18n-content="encryptWithSyncPassphraseLabel">	64 i18n-content="encryptWithSyncPassphraseLabel">

65 </paper-radio-button>	65 </paper-radio-button>

66 </paper-radio-group>	66 </paper-radio-group>

67 <div>	67 <div>

68 <cr-button i18n-content="useDefaultSettingsButton"></cr-button>	68 <paper-button i18n-content="useDefaultSettingsButton"></paper-button>

69 <cr-button i18n-content="cancelButton"></cr-button>	69 <paper-button i18n-content="cancelButton"></paper-button>

70 <cr-button i18n-content="okButton"></cr-button>	70 <paper-button i18n-content="okButton"></paper-button>

71 </div>	71 </div>

72 </template>	72 </template>

73 <script src="sync_page.js"></script>	73 <script src="sync_page.js"></script>

74 </dom-module>	74 </dom-module>

OLD	NEW