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

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

Issue 2467123003: Settings: Internet: Update proxy controlled indicator and fields. (Closed)
Patch Set: Rebase 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="/appearance_page/appearance_page.html"> 2 <link rel="import" href="/appearance_page/appearance_page.html">
3 <link rel="import" href="/search_page/search_page.html"> 3 <link rel="import" href="/search_page/search_page.html">
4 <link rel="import" href="/settings_page/main_page_behavior.html"> 4 <link rel="import" href="/settings_page/main_page_behavior.html">
5 <link rel="import" href="/settings_page/settings_page_visibility.html"> 5 <link rel="import" href="/settings_page/settings_page_visibility.html">
6 <link rel="import" href="/settings_page/settings_section.html"> 6 <link rel="import" href="/settings_page/settings_section.html">
7 <link rel="import" href="/on_startup_page/on_startup_page.html"> 7 <link rel="import" href="/on_startup_page/on_startup_page.html">
8 <link rel="import" href="/people_page/people_page.html"> 8 <link rel="import" href="/people_page/people_page.html">
9 <link rel="import" href="/reset_page/reset_profile_banner.html"> 9 <link rel="import" href="/reset_page/reset_profile_banner.html">
10 <link rel="import" href="/settings_page_css.html"> 10 <link rel="import" href="/settings_page_css.html">
(...skipping 12 matching lines...) Expand all
23 <style include="settings-page-styles"></style> 23 <style include="settings-page-styles"></style>
24 <div> 24 <div>
25 <template is="dom-if" if="[[showResetProfileBanner_]]"> 25 <template is="dom-if" if="[[showResetProfileBanner_]]">
26 <settings-reset-profile-banner on-reset-done="onResetDone_"> 26 <settings-reset-profile-banner on-reset-done="onResetDone_">
27 </settings-reset-profile-banner> 27 </settings-reset-profile-banner>
28 </template> 28 </template>
29 <if expr="chromeos"> 29 <if expr="chromeos">
30 <template is="dom-if" if="[[showPage(pageVisibility.internet)]]" restamp> 30 <template is="dom-if" if="[[showPage(pageVisibility.internet)]]" restamp>
31 <settings-section page-title="$i18n{internetPageTitle}" 31 <settings-section page-title="$i18n{internetPageTitle}"
32 section="internet"> 32 section="internet">
33 <settings-internet-page> 33 <settings-internet-page prefs="{{prefs}}">
34 </settings-internet-page> 34 </settings-internet-page>
35 </settings-section> 35 </settings-section>
36 </template> 36 </template>
37 </if> 37 </if>
38 <template is="dom-if" if="[[showPage(pageVisibility.people)]]" restamp> 38 <template is="dom-if" if="[[showPage(pageVisibility.people)]]" restamp>
39 <settings-section page-title="$i18n{peoplePageTitle}" section="people"> 39 <settings-section page-title="$i18n{peoplePageTitle}" section="people">
40 <settings-people-page prefs="{{prefs}}"></settings-people-page> 40 <settings-people-page prefs="{{prefs}}"></settings-people-page>
41 </settings-section> 41 </settings-section>
42 </template> 42 </template>
43 <template is="dom-if" if="[[showPage(pageVisibility.appearance)]]" 43 <template is="dom-if" if="[[showPage(pageVisibility.appearance)]]"
(...skipping 29 matching lines...) Expand all
73 <template is="dom-if" if="[[showPage(pageVisibility.onStartup)]]" restamp> 73 <template is="dom-if" if="[[showPage(pageVisibility.onStartup)]]" restamp>
74 <settings-section page-title="$i18n{onStartup}" section="onStartup"> 74 <settings-section page-title="$i18n{onStartup}" section="onStartup">
75 <settings-on-startup-page prefs="{{prefs}}"> 75 <settings-on-startup-page prefs="{{prefs}}">
76 </settings-on-startup-page> 76 </settings-on-startup-page>
77 </settings-section> 77 </settings-section>
78 </template> 78 </template>
79 </div> 79 </div>
80 </template> 80 </template>
81 <script src="basic_page.js"></script> 81 <script src="basic_page.js"></script>
82 </dom-module> 82 </dom-module>
OLDNEW
« no previous file with comments | « chrome/app/settings_strings.grdp ('k') | chrome/browser/resources/settings/internet_page/compiled_resources2.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698