chrome/browser/resources/settings/site_settings/category_default_setting.html - Issue 2554403005: [MD settings] move extra options in category settings

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/resources/settings/site_settings/category_default_setting.html

Issue 2554403005: [MD settings] move extra options in category settings (Closed)

Patch Set: renamed modules 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

« chrome/browser/resources/settings/privacy_page/privacy_page.html ('K') | « chrome/browser/resources/settings/settings_resources.grd ('k') | chrome/browser/resources/settings/site_settings/category_default_setting.js » ('j') | chrome/browser/resources/settings/site_settings/category_setting_exceptions.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
(Empty)
	1 <link rel="import" href="chrome://resources/html/polymer.html">

	2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html">

	3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">

	4 <link rel="import" href="/settings_shared_css.html">

	5 <link rel="import" href="/site_settings/constants.html">

	6 <link rel="import" href="/site_settings/site_settings_behavior.html">

	7 <link rel="import" href="/site_settings/site_settings_prefs_browser_proxy.html">

	8

	9 <dom-module id="category-default-setting">
	tommycli 2016/12/15 21:36:38 This and the corresponding js file are basically s This and the corresponding js file are basically straight copies right? other than consolidating flashAskFirst_ and cookiesSessionOnly_ into a single property? dschuyler 2016/12/16 20:39:45 That's the intention. Show quoted text On 2016/12/15 21:36:38, tommycli wrote: > This and the corresponding js file are basically straight copies right? other > than consolidating flashAskFirst_ and cookiesSessionOnly_ into a single > property? That's the intention.
	10 <template>

	11 <style include="settings-shared"></style>
	tommycli 2016/12/15 21:36:38 I see there used to be a rule for paper-toggle-but I see there used to be a rule for paper-toggle-button in site_settings_category. Is that no longer needed? dschuyler 2016/12/16 20:39:45 Correct (err, it wasn't needed in the code before Show quoted text On 2016/12/15 21:36:38, tommycli wrote: > I see there used to be a rule for paper-toggle-button in site_settings_category. > Is that no longer needed? Correct (err, it wasn't needed in the code before this CL either, its use was older than that).
	12 <div class="settings-box first two-line">

	13 <div class="start secondary">[[sliderDescription_]]</div>

	14 <paper-toggle-button id="toggle" checked="{{categoryEnabled}}"

	15 on-change="onChangePermissionControl_"></paper-toggle-button>

	16 </div>

	17

	18 <template is="dom-if" if="[[subOptionLabel]]">

	19 <div class="settings-box">

	20 <div class="start">

	21 [[subOptionLabel]]

	22 <div class="secondary">[[subOptionSecondary]]</div>

	23 </div>

	24 <paper-toggle-button checked="{{subOptionEnabled_}}"

	25 disabled="[[!categoryEnabled]]" id="subOptionToggle"

	26 on-change="onChangePermissionControl_">

	27 </paper-toggle-button>

	28 </div>

	29 </template>

	30 </template>

	31 <script src="category_default_setting.js"></script>

	32 </dom-module>

OLD	NEW