chrome/browser/resources/settings/system_page/system_page.html - Issue 2664503004: MD Settings: Make all HTML import href's relative.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/resources/settings/system_page/system_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

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/paper-button/paper-butt on.html">	2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">

3 <link rel="import" href="/controls/controlled_button.html">	3 <link rel="import" href="../controls/controlled_button.html">

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

5 <link rel="import" href="/controls/settings_toggle_button.html">	5 <link rel="import" href="../controls/settings_toggle_button.html">

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

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

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

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

10	10

11 <dom-module id="settings-system-page">	11 <dom-module id="settings-system-page">

12 <template>	12 <template>

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

14 <div class="settings-box first">	14 <div class="settings-box first">

15 <if expr="not is_macosx">	15 <if expr="not is_macosx">

16 <settings-toggle-button class="start"	16 <settings-toggle-button class="start"

17 pref="{{prefs.background_mode.enabled}}"	17 pref="{{prefs.background_mode.enabled}}"

18 label="$i18n{backgroundAppsLabel}">	18 label="$i18n{backgroundAppsLabel}">

19 </settings-toggle-button>	19 </settings-toggle-button>

(...skipping 23 matching lines...) Expand all Loading...
43 extension-id="[[prefs.proxy.extensionId]]"	43 extension-id="[[prefs.proxy.extensionId]]"

44 extension-name="[[prefs.proxy.controlledByName]]"	44 extension-name="[[prefs.proxy.controlledByName]]"

45 extension-can-be-disabled="[[prefs.proxy.extensionCanBeDisabled]]"	45 extension-can-be-disabled="[[prefs.proxy.extensionCanBeDisabled]]"

46 on-extension-disable="onExtensionDisable_">	46 on-extension-disable="onExtensionDisable_">

47 </extension-controlled-indicator>	47 </extension-controlled-indicator>

48 </div>	48 </div>

49 </template>	49 </template>

50 </template>	50 </template>

51 <script src="system_page.js"></script>	51 <script src="system_page.js"></script>

52 </dom-module>	52 </dom-module>

OLD	NEW

« no previous file with comments | « chrome/browser/resources/settings/site_settings_page/site_settings_page.html ('k') | no next file » | no next file with comments »