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

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

Issue 2863213002: MD Settings: Fix and re-enable settings-main tests. (Closed)
Patch Set: Nit Created 3 years, 7 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/hidden_style_css.html"> 1 <link rel="import" href="chrome://resources/cr_elements/hidden_style_css.html">
2 <link rel="import" href="chrome://resources/cr_elements/icons.html"> 2 <link rel="import" href="chrome://resources/cr_elements/icons.html">
3 <link rel="import" href="chrome://resources/html/polymer.html"> 3 <link rel="import" href="chrome://resources/html/polymer.html">
4 <link rel="import" href="chrome://resources/html/promise_resolver.html"> 4 <link rel="import" href="chrome://resources/html/promise_resolver.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-announcer/iro n-a11y-announcer.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-announcer/iro n-a11y-announcer.html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l">
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="../about_page/about_page.html"> 8 <link rel="import" href="../about_page/about_page.html">
9 <link rel="import" href="../basic_page/basic_page.html"> 9 <link rel="import" href="../basic_page/basic_page.html">
10 <link rel="import" href="../i18n_setup.html"> 10 <link rel="import" href="../i18n_setup.html">
11 <link rel="import" href="../prefs/prefs.html">
11 <link rel="import" href="../route.html"> 12 <link rel="import" href="../route.html">
12 <link rel="import" href="../settings_shared_css.html"> 13 <link rel="import" href="../settings_shared_css.html">
13 <link rel="import" href="../settings_vars_css.html"> 14 <link rel="import" href="../settings_vars_css.html">
14 15
15 <dom-module id="settings-main"> 16 <dom-module id="settings-main">
16 <template> 17 <template>
17 <style include="cr-hidden-style"> 18 <style include="cr-hidden-style">
18 #overscroll { 19 #overscroll {
19 margin-top: 64px; 20 margin-top: 64px;
20 } 21 }
(...skipping 30 matching lines...) Expand all
51 </template> 52 </template>
52 <template is="dom-if" if="[[showPages_.about]]"> 53 <template is="dom-if" if="[[showPages_.about]]">
53 <settings-about-page in-search-mode="[[inSearchMode_]]"> 54 <settings-about-page in-search-mode="[[inSearchMode_]]">
54 </settings-about-page> 55 </settings-about-page>
55 </template> 56 </template>
56 <div id="overscroll" style="padding-bottom: [[overscroll_]]px"></div> 57 <div id="overscroll" style="padding-bottom: [[overscroll_]]px"></div>
57 </template> 58 </template>
58 <script src="settings_main.js"></script> 59 <script src="settings_main.js"></script>
59 <script src="../search_settings.js"></script> 60 <script src="../search_settings.js"></script>
60 </dom-module> 61 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698