chrome/browser/resources/settings/android_apps_page/android_apps_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/android_apps_page/android_apps_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

« no previous file with comments | « chrome/browser/resources/settings/about_page/detailed_build_info.html ('k') | chrome/browser/resources/settings/appearance_page/appearance_fonts_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/i18n_behavior.html">	1 <link rel="import" href="chrome://resources/html/i18n_behavior.html">

2 <link rel="import" href="chrome://resources/html/polymer.html">	2 <link rel="import" href="chrome://resources/html/polymer.html">

3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">	3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">

4 <link rel="import" href="/android_apps_page/android_apps_browser_proxy.html">	4 <link rel="import" href="android_apps_browser_proxy.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="/i18n_setup.html">	6 <link rel="import" href="../i18n_setup.html">

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

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

9	9

10 <dom-module id="settings-android-apps-page">	10 <dom-module id="settings-android-apps-page">

11 <template>	11 <template>

12 <style include="settings-shared">	12 <style include="settings-shared">

13 a {	13 a {

14 -webkit-margin-start: 4px;	14 -webkit-margin-start: 4px;

15 height: var(--checkbox-size);	15 height: var(--checkbox-size);

16 }	16 }

17	17

18 .indented {	18 .indented {

(...skipping 36 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
55 </paper-button>	55 </paper-button>

56 <paper-button class="action-button"	56 <paper-button class="action-button"

57 on-tap="onConfirmDisableDialogConfirm_">	57 on-tap="onConfirmDisableDialogConfirm_">

58 $i18n{confirm}	58 $i18n{confirm}

59 </paper-button>	59 </paper-button>

60 </div>	60 </div>

61 </dialog>	61 </dialog>

62 </template>	62 </template>

63 <script src="android_apps_page.js"></script>	63 <script src="android_apps_page.js"></script>

64 </dom-module>	64 </dom-module>

OLD	NEW