Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/cr_elements/policy/cr_policy_vars_cs s.html"> | 2 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_vars_cs s.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/iron-f lex-layout-classes.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> |
| 8 <link rel="import" href="../clear_browsing_data_dialog/clear_browsing_data_dialo g.html"> | 8 <link rel="import" href="../clear_browsing_data_dialog/clear_browsing_data_dialo g.html"> |
| 9 <link rel="import" href="../controls/settings_toggle_button.html"> | 9 <link rel="import" href="../controls/settings_toggle_button.html"> |
| 10 <link rel="import" href="../lifetime_browser_proxy.html"> | 10 <link rel="import" href="../lifetime_browser_proxy.html"> |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 74 label="$i18n{searchSuggestPref}"> | 74 label="$i18n{searchSuggestPref}"> |
| 75 </settings-toggle-button> | 75 </settings-toggle-button> |
| 76 </div> | 76 </div> |
| 77 <div class="settings-box" | 77 <div class="settings-box" |
| 78 hidden="[[!pageVisibility.networkPrediction]]"> | 78 hidden="[[!pageVisibility.networkPrediction]]"> |
| 79 <settings-toggle-button class="start" | 79 <settings-toggle-button class="start" |
| 80 pref="{{prefs.net.network_prediction_options}}" | 80 pref="{{prefs.net.network_prediction_options}}" |
| 81 label="$i18n{networkPredictionEnabled}"> | 81 label="$i18n{networkPredictionEnabled}"> |
| 82 </settings-toggle-button> | 82 </settings-toggle-button> |
| 83 </div> | 83 </div> |
| 84 <div class="settings-box"> | 84 <div class="settings-box" actionable |
| 85 on-tap="onSafeBrowsingExtendedReportingControlTap_"> | |
| 85 <div class="start">$i18n{safeBrowsingEnableExtendedReporting}</div> | 86 <div class="start">$i18n{safeBrowsingEnableExtendedReporting}</div> |
| 86 <paper-toggle-button id="safeBrowsingExtendedReportingControl" | 87 <paper-toggle-button id="safeBrowsingExtendedReportingControl" |
| 87 on-tap="onSafeBrowsingExtendedReportingControlTap_" | 88 on-change="onSafeBrowsingExtendedReportingControlTap_" |
| 88 checked="[[safeBrowsingExtendedReportingEnabled_]]"> | 89 checked="[[safeBrowsingExtendedReportingEnabled_]]"> |
| 89 </paper-toggle-button> | 90 </paper-toggle-button> |
| 90 </div> | 91 </div> |
| 91 <div class="settings-box"> | 92 <div class="settings-box"> |
| 92 <settings-toggle-button class="start" | 93 <settings-toggle-button class="start" |
| 93 pref="{{prefs.safebrowsing.enabled}}" | 94 pref="{{prefs.safebrowsing.enabled}}" |
| 94 label="$i18n{safeBrowsingEnableProtection}"> | 95 label="$i18n{safeBrowsingEnableProtection}"> |
| 95 </settings-toggle-button> | 96 </settings-toggle-button> |
| 96 </div> | 97 </div> |
| 97 <if expr="_google_chrome"> | 98 <if expr="_google_chrome"> |
| 98 <if expr="chromeos"> | 99 <if expr="chromeos"> |
| 99 <div class="settings-box"> | 100 <div class="settings-box"> |
| 100 <settings-toggle-button class="start" | 101 <settings-toggle-button class="start" |
| 101 pref="{{prefs.cros.metrics.reportingEnabled}}" | 102 pref="{{prefs.cros.metrics.reportingEnabled}}" |
| 102 label="$i18n{enableLogging}"> | 103 label="$i18n{enableLogging}"> |
| 103 </settings-toggle-button> | 104 </settings-toggle-button> |
| 104 </div> | 105 </div> |
| 105 </if><!-- chromeos --> | 106 </if><!-- chromeos --> |
| 106 <if expr="not chromeos"> | 107 <if expr="not chromeos"> |
| 107 <div class="settings-box"> | 108 <div class="settings-box" on-tap="onMetricsReportingControlTap_" |
|
Dan Beam
2017/02/10 07:11:36
this changes the clickable area (compared to other
Dan Beam
2017/02/10 07:11:36
when you tap the box, you want to invert the value
| |
| 109 actionable$="[[!metricsReporting_.managed]]"> | |
| 108 <div class="start">$i18n{enableLogging}</div> | 110 <div class="start">$i18n{enableLogging}</div> |
| 109 <template is="dom-if" if="[[showRestart_]]" restamp> | 111 <template is="dom-if" if="[[showRestart_]]" restamp> |
| 110 <paper-button on-tap="onRestartTap_" id="restart"> | 112 <paper-button on-tap="onRestartTap_" id="restart"> |
| 111 $i18n{restart} | 113 $i18n{restart} |
| 112 </paper-button> | 114 </paper-button> |
| 113 </template> | 115 </template> |
| 114 <template is="dom-if" if="[[metricsReporting_.managed]]" restamp> | 116 <template is="dom-if" if="[[metricsReporting_.managed]]" restamp> |
| 115 <iron-icon id="indicator" tabindex=0 icon="cr:domain"></iron-icon> | 117 <iron-icon id="indicator" tabindex=0 icon="cr:domain"></iron-icon> |
| 116 <paper-tooltip for="indicator" position="top" | 118 <paper-tooltip for="indicator" position="top" |
| 117 fit-to-visible-bounds> | 119 fit-to-visible-bounds> |
| 118 $i18n{controlledSettingPolicy} | 120 $i18n{controlledSettingPolicy} |
| 119 </paper-tooltip> | 121 </paper-tooltip> |
| 120 </template> | 122 </template> |
| 121 <paper-toggle-button id="metricsReportingControl" | 123 <paper-toggle-button id="metricsReportingControl" |
| 122 on-tap="onMetricsReportingControlTap_" | 124 on-change="onMetricsReportingControlTap_" |
|
Dan Beam
2017/02/10 07:11:36
but when this changes, you DON'T want to invert th
Dan Beam
2017/02/10 07:11:36
this doesn't work when you drag the toggle
Dan Beam
2017/02/10 07:14:51
allllso, when you tap on the toggle, you get doubl
scottchen
2017/02/10 18:49:57
Acknowledged. Fixed with a later patch.
scottchen
2017/02/10 18:49:57
on-tap doesn't fire, but on-change seems to fire w
scottchen
2017/02/10 18:49:57
depends on which value. You don't wanna invert .ch
| |
| 123 checked="[[metricsReporting_.enabled]]" | 125 checked="[[metricsReporting_.enabled]]" |
| 124 disabled="[[metricsReporting_.managed]]"> | 126 disabled="[[metricsReporting_.managed]]"> |
| 125 </paper-toggle-button> | 127 </paper-toggle-button> |
| 126 </div> | 128 </div> |
| 127 </if><!-- not chromeos --> | 129 </if><!-- not chromeos --> |
| 128 </if><!-- _google_chrome --> | 130 </if><!-- _google_chrome --> |
| 129 <div class="settings-box"> | 131 <div class="settings-box"> |
| 130 <settings-toggle-button class="start" | 132 <settings-toggle-button class="start" |
| 131 pref="{{prefs.enable_do_not_track}}" | 133 pref="{{prefs.enable_do_not_track}}" |
| 132 label="$i18n{doNotTrack}"> | 134 label="$i18n{doNotTrack}"> |
| (...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 435 <category-setting-exceptions | 437 <category-setting-exceptions |
| 436 category="{{ContentSettingsTypes.PROTECTED_CONTENT}}"> | 438 category="{{ContentSettingsTypes.PROTECTED_CONTENT}}"> |
| 437 </category-setting-exceptions> | 439 </category-setting-exceptions> |
| 438 </if> | 440 </if> |
| 439 </settings-subpage> | 441 </settings-subpage> |
| 440 </template> | 442 </template> |
| 441 </settings-animated-pages> | 443 </settings-animated-pages> |
| 442 </template> | 444 </template> |
| 443 <script src="privacy_page.js"></script> | 445 <script src="privacy_page.js"></script> |
| 444 </dom-module> | 446 </dom-module> |
| OLD | NEW |