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

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

Issue 2840713002: MD Settings: Remove usage of deprecated iron-flex-layout.html. (Closed)
Patch Set: Use cr-hidden-style Created 3 years, 7 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
OLDNEW
1 <link rel="import" href="chrome://resources/html/util.html"> 1 <link rel="import" href="chrome://resources/html/util.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/web_ui_listener_behavior.html"> 3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">
5 <link rel="import" href="../controls/controlled_button.html"> 4 <link rel="import" href="../controls/controlled_button.html">
6 <link rel="import" href="../controls/settings_toggle_button.html"> 5 <link rel="import" href="../controls/settings_toggle_button.html">
7 <link rel="import" href="../settings_shared_css.html"> 6 <link rel="import" href="../settings_shared_css.html">
8 <link rel="import" href="downloads_browser_proxy.html"> 7 <link rel="import" href="downloads_browser_proxy.html">
9 8
10 <dom-module id="settings-downloads-page"> 9 <dom-module id="settings-downloads-page">
11 <template> 10 <template>
12 <style include="settings-shared"></style> 11 <style include="settings-shared"></style>
13 <div class="settings-box first two-line"> 12 <div class="settings-box first two-line">
14 <div class="start"> 13 <div class="start">
15 <div>$i18n{downloadLocation}</div> 14 <div>$i18n{downloadLocation}</div>
16 <div class="secondary" no-search> 15 <div class="secondary" no-search>
17 <if expr="not chromeos"> 16 <if expr="not chromeos">
18 [[prefs.download.default_directory.value]] 17 [[prefs.download.default_directory.value]]
19 </if> 18 </if>
20 <if expr="chromeos"> 19 <if expr="chromeos">
21 [[getDownloadLocation_(prefs.download.default_directory.value)]] 20 [[getDownloadLocation_(prefs.download.default_directory.value)]]
22 </if> 21 </if>
23 </div> 22 </div>
24 </div> 23 </div>
25 <div class="secondary-action"> 24 <div class="secondary-action">
26 <controlled-button class="secondary-button" id="changeDownloadsPath" 25 <controlled-button class="secondary-button" id="changeDownloadsPath"
27 label="$i18n{changeDownloadLocation}" 26 label="$i18n{changeDownloadLocation}"
28 on-tap="selectDownloadLocation_" 27 on-tap="selectDownloadLocation_"
29 pref="[[prefs.download.default_directory]]" 28 pref="[[prefs.download.default_directory]]"
30 end-justified> 29 end-justified>
31 </controlled-button> 30 </controlled-button>
32 </div> 31 </div>
33 </div> 32 </div>
34 <div class="settings-box block"> 33 <div class="settings-box">
michaelpg 2017/04/26 20:36:42 did you test this change on chromeos? .settings-bo
dpapad 2017/04/26 21:57:27 Good catch. Fixed. Restored the "display: block" r
35 <settings-toggle-button 34 <settings-toggle-button
36 pref="{{prefs.download.prompt_for_download}}" 35 pref="{{prefs.download.prompt_for_download}}"
37 label="$i18n{promptForDownload}"> 36 label="$i18n{promptForDownload}">
38 </settings-toggle-button> 37 </settings-toggle-button>
39 <if expr="chromeos"> 38 <if expr="chromeos">
40 <settings-toggle-button 39 <settings-toggle-button
41 pref="{{prefs.gdata.disabled}}" 40 pref="{{prefs.gdata.disabled}}"
42 label="$i18n{disconnectGoogleDriveAccount}" 41 label="$i18n{disconnectGoogleDriveAccount}"
43 hidden="[[!pageVisibility.googleDrive]]"> 42 hidden="[[!pageVisibility.googleDrive]]">
44 </settings-toggle-button> 43 </settings-toggle-button>
45 </if> 44 </if>
46 </div> 45 </div>
47 <template is="dom-if" if="[[autoOpenDownloads_]]" restamp> 46 <template is="dom-if" if="[[autoOpenDownloads_]]" restamp>
48 <div class="settings-box"> 47 <div class="settings-box">
49 <div class="start"> 48 <div class="start">
50 $i18n{openFileTypesAutomatically} 49 $i18n{openFileTypesAutomatically}
51 </div> 50 </div>
52 <div class="secondary-action"> 51 <div class="secondary-action">
53 <paper-button id="resetAutoOpenFileTypes" class="secondary-button" 52 <paper-button id="resetAutoOpenFileTypes" class="secondary-button"
54 on-tap="onClearAutoOpenFileTypesTap_"> 53 on-tap="onClearAutoOpenFileTypesTap_">
55 $i18n{clear} 54 $i18n{clear}
56 </paper-button> 55 </paper-button>
57 </div> 56 </div>
58 </div> 57 </div>
59 </template> 58 </template>
60 </template> 59 </template>
61 <script src="downloads_page.js"></script> 60 <script src="downloads_page.js"></script>
62 </dom-module> 61 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698