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

Side by Side Diff: chrome/browser/resources/settings/on_startup_page/startup_urls_page.html

Issue 2520573002: MD Settings: implement support for extension-controlled startup URLs (Closed)
Patch Set: Created 4 years, 1 month 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="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">
3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.htm l"> 3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.htm l">
4 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> 4 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
5 <link rel="import" href="chrome://resources/cr_elements/cr_scrollable_behavior.h tml"> 5 <link rel="import" href="chrome://resources/cr_elements/cr_scrollable_behavior.h tml">
6 <link rel="import" href="/controls/extension_controlled_indicator.html">
6 <link rel="import" href="/settings_shared_css.html"> 7 <link rel="import" href="/settings_shared_css.html">
7 <link rel="import" href="/on_startup_page/startup_url_dialog.html"> 8 <link rel="import" href="/on_startup_page/startup_url_dialog.html">
8 <link rel="import" href="/on_startup_page/startup_url_entry.html"> 9 <link rel="import" href="/on_startup_page/startup_url_entry.html">
9 <link rel="import" href="/on_startup_page/startup_urls_page_browser_proxy.html"> 10 <link rel="import" href="/on_startup_page/startup_urls_page_browser_proxy.html">
10 11
11 <dom-module id="settings-startup-urls-page"> 12 <dom-module id="settings-startup-urls-page">
12 <template> 13 <template>
13 <style include="settings-shared"> 14 <style include="settings-shared">
14 #outer { 15 #outer {
15 @apply(--settings-list-frame-padding); 16 @apply(--settings-list-frame-padding);
16 max-height: 395px; /** Enough height to show six entries. */ 17 max-height: 395px; /** Enough height to show six entries. */
17 } 18 }
19
18 #container iron-list > settings-startup-url-entry:not(:first-of-type) { 20 #container iron-list > settings-startup-url-entry:not(:first-of-type) {
19 border-top: var(--settings-separator-line); 21 border-top: var(--settings-separator-line);
20 } 22 }
23
24 #container settings-startup-url-entry:not([editable]) {
dpapad 2016/11/18 23:46:28 Do we gain anything by over-specifying the selecto
Dan Beam 2016/11/18 23:51:04 required for specificity (had your version origina
25 background: none;
26 cursor: default;
27 }
21 </style> 28 </style>
22 <div id="outer" class="layout vertical flex"> 29 <div id="outer" class="layout vertical flex">
23 <div id="container" class="scroll-container flex" scrollable> 30 <div id="container" class="scroll-container flex" scrollable>
24 <iron-list items="[[startupPages_]]" scroll-target="container"> 31 <iron-list items="[[startupPages_]]" scroll-target="container">
25 <template> 32 <template>
26 <settings-startup-url-entry model="[[item]]" 33 <settings-startup-url-entry model="[[item]]"
27 tabindex$="[[tabIndex]]"> 34 tabindex$="[[tabIndex]]"
35 editable="[[!prefs.session.startup_urls.controlledBy]]">
28 </settings-startup-url-entry> 36 </settings-startup-url-entry>
29 </template> 37 </template>
30 </iron-list> 38 </iron-list>
31 </div> 39 </div>
32 <div class="list-item list-button" id="addPage" on-tap="onAddPageTap_"> 40 <template is="dom-if" if="[[!prefs.session.startup_urls.controlledBy]]">
33 $i18n{onStartupAddNewPage} 41 <div class="list-item list-button" id="addPage" on-tap="onAddPageTap_">
34 </div> 42 $i18n{onStartupAddNewPage}
35 <div class="list-item list-button" id="useCurrentPages" 43 </div>
36 on-tap="onUseCurrentPagesTap_">$i18n{onStartupUseCurrent}</div> 44 <div class="list-item list-button" id="useCurrentPages"
45 on-tap="onUseCurrentPagesTap_">$i18n{onStartupUseCurrent}</div>
46 </template>
47 <template is="dom-if" if="[[prefs.session.startup_urls.extensionId]]">
48 <extension-controlled-indicator
49 extension-id="[[prefs.session.startup_urls.extensionId]]"
50 extension-name="[[prefs.session.startup_urls.controlledByName]]"
51 extension-can-be-disabled="[[
52 prefs.session.startup_urls.extensionCanBeDisabled]]">
53 </extension-controlled-indicator>
54 </template>
37 </div> 55 </div>
38 <template is="dom-if" if="[[showStartupUrlDialog_]]" restamp> 56 <template is="dom-if" if="[[showStartupUrlDialog_]]" restamp>
39 <settings-startup-url-dialog model="[[startupUrlDialogModel_]]" 57 <settings-startup-url-dialog model="[[startupUrlDialogModel_]]"
40 on-close="destroyUrlDialog_"> 58 on-close="destroyUrlDialog_">
41 </settings-startup-url-dialog> 59 </settings-startup-url-dialog>
42 </template> 60 </template>
43 </template> 61 </template>
44 <script src="startup_urls_page.js"></script> 62 <script src="startup_urls_page.js"></script>
45 </dom-module> 63 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698