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

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

Issue 2681373002: MD Settings: Fix the Network Prediction toggle box. (Closed)
Patch Set: fix the merge Created 3 years, 10 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/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/i18n_behavior.html"> 3 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
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/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html">
6 <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/neon-animation/neon-ani matable.html">
7 <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-button/paper-butt on.html">
8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
9 <link rel="import" href="../clear_browsing_data_dialog/clear_browsing_data_dialo g.html"> 9 <link rel="import" href="../clear_browsing_data_dialog/clear_browsing_data_dialo g.html">
10 <link rel="import" href="../controls/settings_toggle_button.html"> 10 <link rel="import" href="../controls/settings_toggle_button.html">
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 <div class="settings-box" hidden="[[!pageVisibility.searchPrediction]]"> 72 <div class="settings-box" hidden="[[!pageVisibility.searchPrediction]]">
73 <settings-toggle-button class="start" 73 <settings-toggle-button class="start"
74 pref="{{prefs.search.suggest_enabled}}" 74 pref="{{prefs.search.suggest_enabled}}"
75 label="$i18n{searchSuggestPref}"> 75 label="$i18n{searchSuggestPref}">
76 </settings-toggle-button> 76 </settings-toggle-button>
77 </div> 77 </div>
78 <div class="settings-box" 78 <div class="settings-box"
79 hidden="[[!pageVisibility.networkPrediction]]"> 79 hidden="[[!pageVisibility.networkPrediction]]">
80 <settings-toggle-button class="start" 80 <settings-toggle-button class="start"
81 pref="{{prefs.net.network_prediction_options}}" 81 pref="{{prefs.net.network_prediction_options}}"
82 label="$i18n{networkPredictionEnabled}"> 82 label="$i18n{networkPredictionEnabled}"
83 numeric-unchecked-value="[[networkPredictionEnum_.NEVER]]">
83 </settings-toggle-button> 84 </settings-toggle-button>
84 </div> 85 </div>
85 <div class="settings-box"> 86 <div class="settings-box">
86 <div class="start">$i18n{safeBrowsingEnableExtendedReporting}</div> 87 <div class="start">$i18n{safeBrowsingEnableExtendedReporting}</div>
87 <paper-toggle-button id="safeBrowsingExtendedReportingControl" 88 <paper-toggle-button id="safeBrowsingExtendedReportingControl"
88 on-tap="onSafeBrowsingExtendedReportingControlTap_" 89 on-tap="onSafeBrowsingExtendedReportingControlTap_"
89 checked="[[safeBrowsingExtendedReportingEnabled_]]"> 90 checked="[[safeBrowsingExtendedReportingEnabled_]]">
90 </paper-toggle-button> 91 </paper-toggle-button>
91 </div> 92 </div>
92 <div class="settings-box"> 93 <div class="settings-box">
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 category="{{ContentSettingsTypes.PROTECTED_CONTENT}}"> 446 category="{{ContentSettingsTypes.PROTECTED_CONTENT}}">
446 </category-setting-exceptions> 447 </category-setting-exceptions>
447 </template> 448 </template>
448 </if> 449 </if>
449 </settings-subpage> 450 </settings-subpage>
450 </template> 451 </template>
451 </settings-animated-pages> 452 </settings-animated-pages>
452 </template> 453 </template>
453 <script src="privacy_page.js"></script> 454 <script src="privacy_page.js"></script>
454 </dom-module> 455 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698