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

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

Issue 2583743002: Add mac-only "Set Up Automatic Updates..." button to the new about page. (Closed)
Patch Set: add back nullptr check Created 4 years 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/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="/lifetime_browser_proxy.html"> 5 <link rel="import" href="/lifetime_browser_proxy.html">
6 <link rel="import" href="/route.html"> 6 <link rel="import" href="/route.html">
7 <link rel="import" href="/settings_page/main_page_behavior.html"> 7 <link rel="import" href="/settings_page/main_page_behavior.html">
8 <link rel="import" href="/settings_page/settings_animated_pages.html"> 8 <link rel="import" href="/settings_page/settings_animated_pages.html">
9 <link rel="import" href="/settings_page/settings_section.html"> 9 <link rel="import" href="/settings_page/settings_section.html">
10 <link rel="import" href="/settings_page_css.html"> 10 <link rel="import" href="/settings_page_css.html">
11 <link rel="import" href="/settings_shared_css.html"> 11 <link rel="import" href="/settings_shared_css.html">
12 <link rel="import" href="chrome://resources/cr_elements/icons.html"> 12 <link rel="import" href="chrome://resources/cr_elements/icons.html">
13 <link rel="import" href="chrome://resources/html/assert.html"> 13 <link rel="import" href="chrome://resources/html/assert.html">
14 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 14 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
15 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> 15 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
16 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> 16 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l">
17 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 17 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
18 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 18 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
19 19
20 <if expr="chromeos"> 20 <if expr="chromeos">
21 <link rel="import" href="/about_page/detailed_build_info.html"> 21 <link rel="import" href="/about_page/detailed_build_info.html">
22 <link rel="import" href="/settings_page/settings_subpage.html"> 22 <link rel="import" href="/settings_page/settings_subpage.html">
23 </if> 23 </if>
24 24
25 <if expr="_google_chrome and is_macosx">
26 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
27 </if>
28
25 <dom-module id="settings-about-page"> 29 <dom-module id="settings-about-page">
26 <template> 30 <template>
27 <style include="settings-shared settings-page-styles"> 31 <style include="settings-shared settings-page-styles">
28 :host { 32 :host {
29 --about-page-image-space: 10px; 33 --about-page-image-space: 10px;
30 } 34 }
31 35
32 .copyable { 36 .copyable {
33 -webkit-user-select: text; 37 -webkit-user-select: text;
34 } 38 }
(...skipping 27 matching lines...) Expand all
62 padding-top: 10px; 66 padding-top: 10px;
63 } 67 }
64 68
65 .info-section { 69 .info-section {
66 margin-bottom: 12px; 70 margin-bottom: 12px;
67 } 71 }
68 72
69 #regulatoryInfo img { 73 #regulatoryInfo img {
70 width: 330px; 74 width: 330px;
71 } 75 }
76
77 <if expr="_google_chrome and is_macosx">
78 #promoteUpdater[disabled] {
79 @apply(--settings-secondary);
80 }
81 </if>
72 </style> 82 </style>
73 <div> 83 <div>
74 <settings-section page-title="$i18n{aboutPageTitle}" section="about"> 84 <settings-section page-title="$i18n{aboutPageTitle}" section="about">
75 <settings-animated-pages id="pages" section="about"> 85 <settings-animated-pages id="pages" section="about">
76 <neon-animatable route-path="default"> 86 <neon-animatable route-path="default">
77 <div class="settings-box two-line"> 87 <div class="settings-box two-line">
78 <img id="product-logo" on-tap="onProductLogoTap_" 88 <img id="product-logo" on-tap="onProductLogoTap_"
79 srcset="chrome://theme/current-channel-logo@1x 1x, 89 srcset="chrome://theme/current-channel-logo@1x 1x,
80 chrome://theme/current-channel-logo@2x 2x" alt=""> 90 chrome://theme/current-channel-logo@2x 2x" alt="">
81 <span class="product-title">$i18n{aboutProductTitle}</span> 91 <span class="product-title">$i18n{aboutProductTitle}</span>
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 $i18n{aboutRelaunchAndPowerwash} 131 $i18n{aboutRelaunchAndPowerwash}
122 </paper-button> 132 </paper-button>
123 <paper-button id="checkForUpdates" class="secondary-button" 133 <paper-button id="checkForUpdates" class="secondary-button"
124 hidden="[[!showCheckUpdates_]]" 134 hidden="[[!showCheckUpdates_]]"
125 on-tap="onCheckUpdatesTap_"> 135 on-tap="onCheckUpdatesTap_">
126 $i18n{aboutCheckForUpdates} 136 $i18n{aboutCheckForUpdates}
127 </paper-button> 137 </paper-button>
128 </if> 138 </if>
129 </span> 139 </span>
130 </div> 140 </div>
141 <if expr="_google_chrome and is_macosx">
142 <template is="dom-if" if="[[!promoteUpdaterStatus_.hidden]]">
143 <div id="promoteUpdater" class="settings-box"
144 disabled$="[[promoteUpdaterStatus_.disabled]]"
145 actionable$="[[promoteUpdaterStatus_.actionable]]"
146 on-tap="onPromoteUpdaterTap_">
147 <div class="start">
148 [[promoteUpdaterStatus_.text]]
149 <a href="https://support.google.com/chrome/answer/95414"
150 target="_blank" id="updaterLearnMore"
151 on-tap="onLearnMoreTap_">
152 $i18n{learnMore}
153 </a>
154 </div>
155 <button class="subpage-arrow" is="paper-icon-button-light"
156 disabled="[[promoteUpdaterStatus_.disabled]]"
157 hidden="[[!promoteUpdaterStatus_.actionable]]">
158 </button>
159 </div>
160 </template>
161 </if>
131 <div id="help" class="settings-box" on-tap="onHelpTap_" actionable> 162 <div id="help" class="settings-box" on-tap="onHelpTap_" actionable>
132 <div class="start">$i18n{aboutGetHelpUsingChrome}</div> 163 <div class="start">$i18n{aboutGetHelpUsingChrome}</div>
133 <button class="icon-external" is="paper-icon-button-light"> 164 <button class="icon-external" is="paper-icon-button-light">
134 </button> 165 </button>
135 </div> 166 </div>
136 <if expr="_google_chrome"> 167 <if expr="_google_chrome">
137 <div id="reportIssue" class="settings-box" actionable 168 <div id="reportIssue" class="settings-box" actionable
138 on-tap="onReportIssueTap_"> 169 on-tap="onReportIssueTap_">
139 <div class="start">$i18n{aboutReportAnIssue}</div> 170 <div class="start">$i18n{aboutReportAnIssue}</div>
140 <button class="subpage-arrow" is="paper-icon-button-light"> 171 <button class="subpage-arrow" is="paper-icon-button-light">
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 <settings-detailed-build-info></settings-detailed-build-info> 209 <settings-detailed-build-info></settings-detailed-build-info>
179 </settings-subpage> 210 </settings-subpage>
180 </template> 211 </template>
181 </if> 212 </if>
182 </settings-animated-pages> 213 </settings-animated-pages>
183 </settings-section> 214 </settings-section>
184 </div> 215 </div>
185 </template> 216 </template>
186 <script src="about_page.js"></script> 217 <script src="about_page.js"></script>
187 </dom-module> 218 </dom-module>
OLDNEW
« no previous file with comments | « chrome/browser/mac/keystone_glue.mm ('k') | chrome/browser/resources/settings/about_page/about_page.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698