chrome/browser/resources/settings/about_page/channel_switcher_dialog.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/about_page/channel_switcher_dialog.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/about_page.html ('k') | chrome/browser/resources/settings/about_page/detailed_build_info.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/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/html/polymer.html">	2 <link rel="import" href="chrome://resources/html/polymer.html">

3 <link rel="import" href="chrome://resources/html/i18n_behavior.html">	3 <link rel="import" href="chrome://resources/html/i18n_behavior.html">

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

5 <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-button/pape r-radio-button.html">

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

7 <link rel="import" href="/about_page/about_page_browser_proxy.html">	7 <link rel="import" href="about_page_browser_proxy.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-channel-switcher-dialog">	10 <dom-module id="settings-channel-switcher-dialog">

11 <template>	11 <template>

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

13 <dialog is="cr-dialog" id="dialog">	13 <dialog is="cr-dialog" id="dialog">

14 <div class="title">$i18n{aboutChangeChannel}</div>	14 <div class="title">$i18n{aboutChangeChannel}</div>

15 <div class="body">	15 <div class="body">

16 <!-- TODO(dbeam): this can be policy-controlled. Show this in the UI.	16 <!-- TODO(dbeam): this can be policy-controlled. Show this in the UI.

17 https://www.chromium.org/administrators/policy-list-3#ChromeOsRelea seChannel	17 https://www.chromium.org/administrators/policy-list-3#ChromeOsRelea seChannel

18 -->	18 -->

(...skipping 25 matching lines...) Expand all Loading...
44 <paper-button id="changeChannelAndPowerwash" class="action-button"	44 <paper-button id="changeChannelAndPowerwash" class="action-button"

45 on-tap="onChangeChannelAndPowerwashTap_"	45 on-tap="onChangeChannelAndPowerwashTap_"

46 hidden="[[!shouldShowButtons_.changeChannelAndPowerwash]]">	46 hidden="[[!shouldShowButtons_.changeChannelAndPowerwash]]">

47 $i18n{aboutChangeChannelAndPowerwash}	47 $i18n{aboutChangeChannelAndPowerwash}

48 </paper-button>	48 </paper-button>

49 </div>	49 </div>

50 </dialog>	50 </dialog>

51 </template>	51 </template>

52 <script src="channel_switcher_dialog.js"></script>	52 <script src="channel_switcher_dialog.js"></script>

53 </dom-module>	53 </dom-module>

OLD	NEW