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

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

Issue 2259163002: MD Settings: Fix scrolling bugs and hacks caused by undefined load behavior (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@TransitionsNoTestsFakeRebase
Patch Set: rebase Created 4 years, 2 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/cr_elements/icons.html"> 1 <link rel="import" href="chrome://resources/cr_elements/icons.html">
2 <link rel="import" href="chrome://resources/html/polymer.html"> 2 <link rel="import" href="chrome://resources/html/polymer.html">
3 <link rel="import" href="chrome://resources/html/promise_resolver.html"> 3 <link rel="import" href="chrome://resources/html/promise_resolver.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l">
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
6 <link rel="import" href="/about_page/about_page.html"> 6 <link rel="import" href="/about_page/about_page.html">
7 <link rel="import" href="/advanced_page/advanced_page.html"> 7 <link rel="import" href="/advanced_page/advanced_page.html">
8 <link rel="import" href="/basic_page/basic_page.html"> 8 <link rel="import" href="/basic_page/basic_page.html">
9 <link rel="import" href="/route.html"> 9 <link rel="import" href="/route.html">
10 <link rel="import" href="/settings_page/main_page_behavior.html"> 10 <link rel="import" href="/settings_page/main_page_behavior.html">
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 margin-bottom: 10px; 56 margin-bottom: 10px;
57 } 57 }
58 </style> 58 </style>
59 <content select="paper-icon-button"></content> 59 <content select="paper-icon-button"></content>
60 <div id="noSearchResults" hidden$="[[!showNoResultsFound_]]"> 60 <div id="noSearchResults" hidden$="[[!showNoResultsFound_]]">
61 <div>$i18n{searchNoResults}</div> 61 <div>$i18n{searchNoResults}</div>
62 <div>$i18nRaw{searchNoResultsHelp}</div> 62 <div>$i18nRaw{searchNoResultsHelp}</div>
63 </div> 63 </div>
64 <template is="dom-if" if="[[showBasicPage_( 64 <template is="dom-if" if="[[showBasicPage_(
65 showPages_.basic, inSearchMode_, hasExpandedSection_)]]"> 65 showPages_.basic, inSearchMode_, hasExpandedSection_)]]">
66 <settings-basic-page route="BASIC" prefs="{{prefs}}" 66 <settings-basic-page prefs="{{prefs}}"
67 page-visibility="[[pageVisibility]]" 67 page-visibility="[[pageVisibility]]"
68 on-subpage-expand="onSubpageExpand_" 68 on-subpage-expand="onSubpageExpand_"
69 on-freeze-scroll="onFreezeScroll_"> 69 on-freeze-scroll="onFreezeScroll_">
70 </settings-basic-page> 70 </settings-basic-page>
71 </template> 71 </template>
72 <template is="dom-if" 72 <template is="dom-if"
73 if="[[showAdvancedSettings_(pageVisibility.advancedSettings)]]"> 73 if="[[showAdvancedSettings_(pageVisibility.advancedSettings)]]">
74 <template is="dom-if" if="[[showAdvancedToggle_( 74 <template is="dom-if" if="[[showAdvancedToggle_(
75 showPages_.basic, hasExpandedSection_, inSearchMode_)]]"> 75 showPages_.basic, hasExpandedSection_, inSearchMode_)]]">
76 <div id="toggleSpacer"></div> 76 <div id="toggleSpacer"></div>
77 <div id="toggleContainer"> 77 <div id="toggleContainer">
78 <paper-button id="advancedToggle" on-tap="toggleAdvancedPage_"> 78 <paper-button id="advancedToggle" on-tap="toggleAdvancedPage_">
79 <span>$i18n{advancedPageTitle}</span> 79 <span>$i18n{advancedPageTitle}</span>
80 <iron-icon icon="[[arrowState_(advancedToggleExpanded_)]]"> 80 <iron-icon icon="[[arrowState_(advancedToggleExpanded_)]]">
81 </iron-icon> 81 </iron-icon>
82 </paper-button> 82 </paper-button>
83 </div> 83 </div>
84 </template> 84 </template>
85 <template is="dom-if" if="[[showAdvancedPage_( 85 <template is="dom-if" if="[[showAdvancedPage_(
86 showPages_.advanced, inSearchMode_, hasExpandedSection_)]]"> 86 showPages_.advanced, inSearchMode_, hasExpandedSection_)]]">
87 <settings-advanced-page route="ADVANCED" prefs="{{prefs}}" 87 <settings-advanced-page prefs="{{prefs}}"
88 page-visibility="[[pageVisibility]]" 88 page-visibility="[[pageVisibility]]"
89 on-subpage-expand="onSubpageExpand_" 89 on-subpage-expand="onSubpageExpand_"
90 on-freeze-scroll="onFreezeScroll_"> 90 on-freeze-scroll="onFreezeScroll_">
91 </settings-advanced-page> 91 </settings-advanced-page>
92 </template> 92 </template>
93 </template> 93 </template>
94 <template is="dom-if" if="[[showPages_.about]]"> 94 <template is="dom-if" if="[[showPages_.about]]">
95 <settings-about-page route="ABOUT"></settings-about-page> 95 <settings-about-page></settings-about-page>
96 </template> 96 </template>
97 <div id="overscroll" style="padding-bottom: [[overscroll_]]px"></div> 97 <div id="overscroll" style="padding-bottom: [[overscroll_]]px"></div>
98 </template> 98 </template>
99 <script src="settings_main.js"></script> 99 <script src="settings_main.js"></script>
100 <script src="/search_settings.js"></script> 100 <script src="/search_settings.js"></script>
101 </dom-module> 101 </dom-module>
OLDNEW
« no previous file with comments | « chrome/browser/resources/settings/settings.html ('k') | chrome/browser/resources/settings/settings_page/main_page_behavior.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698