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

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

Issue 2011703002: MD Settings: About page, hooking up channel switcher dialog. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@about_regulatory_info
Patch Set: Indentation nits, after merging. Created 4 years, 6 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 | « no previous file | chrome/browser/resources/settings/about_page/about_page.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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="/about_page/about_page_browser_proxy.html"> 2 <link rel="import" href="/about_page/about_page_browser_proxy.html">
3 <link rel="import" href="/i18n_setup.html"> 3 <link rel="import" href="/i18n_setup.html">
4 <link rel="import" href="/icons.html"> 4 <link rel="import" href="/icons.html">
5 <link rel="import" href="/settings_page/main_page_behavior.html"> 5 <link rel="import" href="/settings_page/main_page_behavior.html">
6 <link rel="import" href="/settings_page/settings_animated_pages.html"> 6 <link rel="import" href="/settings_page/settings_animated_pages.html">
7 <link rel="import" href="/settings_page/settings_section.html"> 7 <link rel="import" href="/settings_page/settings_section.html">
8 <link rel="import" href="/settings_page_css.html"> 8 <link rel="import" href="/settings_page_css.html">
9 <link rel="import" href="/settings_shared_css.html"> 9 <link rel="import" href="/settings_shared_css.html">
10 <link rel="import" href="chrome://resources/cr_elements/icons.html"> 10 <link rel="import" href="chrome://resources/cr_elements/icons.html">
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 <div hidden="[[!shouldShowUpdateStatus_( 71 <div hidden="[[!shouldShowUpdateStatus_(
72 currentUpdateStatusEvent_)]]"> 72 currentUpdateStatusEvent_)]]">
73 <iron-icon 73 <iron-icon
74 icon$="[[getIcon_(currentUpdateStatusEvent_)]]" 74 icon$="[[getIcon_(currentUpdateStatusEvent_)]]"
75 src="[[getIconSrc_(currentUpdateStatusEvent_)]]"> 75 src="[[getIconSrc_(currentUpdateStatusEvent_)]]">
76 </iron-icon> 76 </iron-icon>
77 </div> 77 </div>
78 <div class="start"> 78 <div class="start">
79 <div hidden="[[!shouldShowUpdateStatus_( 79 <div hidden="[[!shouldShowUpdateStatus_(
80 currentUpdateStatusEvent_)]]"> 80 currentUpdateStatusEvent_)]]">
81 [[getUpdateStatusMessage_(currentUpdateStatusEvent_)]] 81 [[getUpdateStatusMessage_(
82 currentUpdateStatusEvent_, targetChannel_)]]
82 </div> 83 </div>
83 <div class="secondary">$i18n{aboutBrowserVersion}</div> 84 <div class="secondary">$i18n{aboutBrowserVersion}</div>
84 </div> 85 </div>
85 <paper-button id="relaunch" class="secondary-action" 86 <paper-button id="relaunch" class="secondary-action"
87 <if expr="not chromeos">
86 hidden="[[!shouldShowRelaunch_(currentUpdateStatusEvent_)]]" 88 hidden="[[!shouldShowRelaunch_(currentUpdateStatusEvent_)]]"
89 </if>
90 <if expr="chromeos">
91 hidden="[[!shouldShowRelaunch_(
92 currentUpdateStatusEvent_, targetChannel_)]]"
93 </if>
87 on-tap="onRelaunchTap_"> 94 on-tap="onRelaunchTap_">
88 $i18n{aboutRelaunch} 95 $i18n{aboutRelaunch}
89 </paper-button> 96 </paper-button>
90 <if expr="chromeos"> 97 <if expr="chromeos">
91 <paper-button id="relaunchAndPowerwash" class="secondary-action" 98 <paper-button id="relaunchAndPowerwash" class="secondary-action"
92 hidden="[[!shouldShowRelaunchAndPowerwash_( 99 hidden="[[!shouldShowRelaunchAndPowerwash_(
93 currentUpdateStatusEvent_)]]" 100 currentUpdateStatusEvent_, targetChannel_)]]"
94 on-tap="onRelaunchAndPowerwashTap_"> 101 on-tap="onRelaunchAndPowerwashTap_">
95 $i18n{aboutRelaunchAndPowerwash} 102 $i18n{aboutRelaunchAndPowerwash}
96 </paper-button> 103 </paper-button>
97 <paper-button id="checkForUpdates" class="secondary-action" 104 <paper-button id="checkForUpdates" class="secondary-action"
98 hidden="[[!shouldShowCheckUpdates_( 105 hidden="[[!shouldShowCheckUpdates_(currentUpdateStatusEvent_)] ]"
99 currentUpdateStatusEvent_)]]"
100 on-tap="onCheckUpdatesTap_"> 106 on-tap="onCheckUpdatesTap_">
101 $i18n{aboutCheckForUpdates} 107 $i18n{aboutCheckForUpdates}
102 </paper-button> 108 </paper-button>
103 </if> 109 </if>
104 </div> 110 </div>
105 <div id="help" class="settings-box two-line" on-tap="onHelpTap_"> 111 <div id="help" class="settings-box two-line" on-tap="onHelpTap_">
106 $i18n{aboutGetHelpUsingChrome} 112 $i18n{aboutGetHelpUsingChrome}
107 </div> 113 </div>
108 <if expr="_google_chrome"> 114 <if expr="_google_chrome">
109 <div id="reportIssue" class="settings-box" 115 <div id="reportIssue" class="settings-box"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 <settings-detailed-build-info></settings-detailed-build-info> 152 <settings-detailed-build-info></settings-detailed-build-info>
147 </settings-subpage> 153 </settings-subpage>
148 </template> 154 </template>
149 </if> 155 </if>
150 </settings-animated-pages> 156 </settings-animated-pages>
151 </settings-section> 157 </settings-section>
152 </div> 158 </div>
153 </template> 159 </template>
154 <script src="about_page.js"></script> 160 <script src="about_page.js"></script>
155 </dom-module> 161 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/about_page/about_page.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698