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

Unified 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: fix closure? 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/settings/on_startup_page/startup_urls_page.html
diff --git a/chrome/browser/resources/settings/on_startup_page/startup_urls_page.html b/chrome/browser/resources/settings/on_startup_page/startup_urls_page.html
index 4abc08282d2b2935753fdf92acceb6f66e1e8cfc..8a4a1bf14ce3c4519f56a3173afef2338a1bf4a3 100644
--- a/chrome/browser/resources/settings/on_startup_page/startup_urls_page.html
+++ b/chrome/browser/resources/settings/on_startup_page/startup_urls_page.html
@@ -3,6 +3,7 @@
<link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.html">
<link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
<link rel="import" href="chrome://resources/cr_elements/cr_scrollable_behavior.html">
+<link rel="import" href="/controls/extension_controlled_indicator.html">
<link rel="import" href="/settings_shared_css.html">
<link rel="import" href="/on_startup_page/startup_url_dialog.html">
<link rel="import" href="/on_startup_page/startup_url_entry.html">
@@ -15,25 +16,44 @@
@apply(--settings-list-frame-padding);
max-height: 395px; /** Enough height to show six entries. */
}
+
#container iron-list > settings-startup-url-entry:not(:first-of-type) {
border-top: var(--settings-separator-line);
}
+
+ #container settings-startup-url-entry:not([editable]) {
+ background: none;
+ cursor: default;
+ }
</style>
<div id="outer" class="layout vertical flex">
<div id="container" class="scroll-container flex" scrollable>
<iron-list items="[[startupPages_]]" scroll-target="container">
<template>
<settings-startup-url-entry model="[[item]]"
- tabindex$="[[tabIndex]]">
+ tabindex$="[[tabIndex]]"
+ editable="[[!prefs.session.startup_urls.controlledBy]]">
</settings-startup-url-entry>
</template>
</iron-list>
</div>
- <div class="list-item list-button" id="addPage" on-tap="onAddPageTap_">
- $i18n{onStartupAddNewPage}
- </div>
- <div class="list-item list-button" id="useCurrentPages"
- on-tap="onUseCurrentPagesTap_">$i18n{onStartupUseCurrent}</div>
+ <template is="dom-if" if="[[!prefs.session.startup_urls.controlledBy]]"
+ restamp>
+ <div class="list-item list-button" id="addPage" on-tap="onAddPageTap_">
+ $i18n{onStartupAddNewPage}
+ </div>
+ <div class="list-item list-button" id="useCurrentPages"
+ on-tap="onUseCurrentPagesTap_">$i18n{onStartupUseCurrent}</div>
+ </template>
+ <template is="dom-if" if="[[prefs.session.startup_urls.extensionId]]"
+ restamp>
+ <extension-controlled-indicator
+ extension-id="[[prefs.session.startup_urls.extensionId]]"
+ extension-name="[[prefs.session.startup_urls.controlledByName]]"
+ extension-can-be-disabled="[[
+ prefs.session.startup_urls.extensionCanBeDisabled]]">
+ </extension-controlled-indicator>
+ </template>
</div>
<template is="dom-if" if="[[showStartupUrlDialog_]]" restamp>
<settings-startup-url-dialog model="[[startupUrlDialogModel_]]"

Powered by Google App Engine
This is Rietveld 408576698