Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(411)

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

Issue 2664503004: MD Settings: Make all HTML import href's relative. (Closed)
Patch Set: resolve more conflicts Created 3 years, 10 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
OLDNEW
1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html "> 1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html ">
2 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html"> 2 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html">
3 <link rel="import" href="chrome://resources/cr_elements/icons.html"> 3 <link rel="import" href="chrome://resources/cr_elements/icons.html">
4 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 4 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
5 <link rel="import" href="chrome://resources/html/icon.html"> 5 <link rel="import" href="chrome://resources/html/icon.html">
6 <link rel="import" href="chrome://resources/html/polymer.html"> 6 <link rel="import" href="chrome://resources/html/polymer.html">
7 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> 7 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html">
9 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 9 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
11 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html"> 11 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html">
12 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> 12 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
13 <link rel="import" href="/controls/settings_toggle_button.html"> 13 <link rel="import" href="../controls/settings_toggle_button.html">
14 <link rel="import" href="/people_page/sync_page.html"> 14 <link rel="import" href="sync_page.html">
15 <link rel="import" href="/people_page/profile_info_browser_proxy.html"> 15 <link rel="import" href="profile_info_browser_proxy.html">
16 <link rel="import" href="/people_page/sync_browser_proxy.html"> 16 <link rel="import" href="sync_browser_proxy.html">
17 <link rel="import" href="/route.html"> 17 <link rel="import" href="../route.html">
18 <link rel="import" href="/settings_page/settings_animated_pages.html"> 18 <link rel="import" href="../settings_page/settings_animated_pages.html">
19 <link rel="import" href="/settings_page/settings_subpage.html"> 19 <link rel="import" href="../settings_page/settings_subpage.html">
20 <link rel="import" href="/settings_shared_css.html"> 20 <link rel="import" href="../settings_shared_css.html">
21 21
22 <if expr="chromeos"> 22 <if expr="chromeos">
23 <link rel="import" href="/people_page/change_picture.html"> 23 <link rel="import" href="change_picture.html">
24 <link rel="import" href="/people_page/easy_unlock_browser_proxy.html"> 24 <link rel="import" href="easy_unlock_browser_proxy.html">
25 <link rel="import" href="/people_page/easy_unlock_turn_off_dialog.html"> 25 <link rel="import" href="easy_unlock_turn_off_dialog.html">
26 <link rel="import" href="/people_page/lock_screen.html"> 26 <link rel="import" href="lock_screen.html">
27 <link rel="import" href="/people_page/lock_state_behavior.html"> 27 <link rel="import" href="lock_state_behavior.html">
28 <link rel="import" href="/people_page/users_page.html"> 28 <link rel="import" href="users_page.html">
29 </if> 29 </if>
30 <if expr="not chromeos"> 30 <if expr="not chromeos">
31 <link rel="import" href="/people_page/import_data_dialog.html"> 31 <link rel="import" href="import_data_dialog.html">
32 <link rel="import" href="/people_page/manage_profile.html"> 32 <link rel="import" href="manage_profile.html">
33 </if> 33 </if>
34 34
35 <dom-module id="settings-people-page"> 35 <dom-module id="settings-people-page">
36 <template> 36 <template>
37 <style include="settings-shared"> 37 <style include="settings-shared">
38 setting-box.middle { 38 setting-box.middle {
39 /* Per spec, middle text is indented 20px in this section. */ 39 /* Per spec, middle text is indented 20px in this section. */
40 -webkit-margin-start: 20px; 40 -webkit-margin-start: 20px;
41 } 41 }
42 42
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 <if expr="chromeos"> 396 <if expr="chromeos">
397 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]"> 397 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]">
398 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog" 398 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"
399 on-close="onEasyUnlockTurnOffDialogClose_"> 399 on-close="onEasyUnlockTurnOffDialogClose_">
400 </easy-unlock-turn-off-dialog> 400 </easy-unlock-turn-off-dialog>
401 </template> 401 </template>
402 </if> 402 </if>
403 </template> 403 </template>
404 <script src="people_page.js"></script> 404 <script src="people_page.js"></script>
405 </dom-module> 405 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698