OLD | NEW |
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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 </style> | 61 </style> |
62 <content select="paper-icon-button"></content> | 62 <content select="paper-icon-button"></content> |
63 <div id="noSearchResults" hidden$="[[!showNoResultsFound_]]"> | 63 <div id="noSearchResults" hidden$="[[!showNoResultsFound_]]"> |
64 <div>$i18n{searchNoResults}</div> | 64 <div>$i18n{searchNoResults}</div> |
65 <div>$i18nRaw{searchNoResultsHelp}</div> | 65 <div>$i18nRaw{searchNoResultsHelp}</div> |
66 </div> | 66 </div> |
67 <template is="dom-if" if="[[showBasicPage_( | 67 <template is="dom-if" if="[[showBasicPage_( |
68 showPages_.basic, inSearchMode_, hasExpandedSection_)]]"> | 68 showPages_.basic, inSearchMode_, hasExpandedSection_)]]"> |
69 <settings-basic-page prefs="{{prefs}}" | 69 <settings-basic-page prefs="{{prefs}}" |
70 page-visibility="[[pageVisibility]]" | 70 page-visibility="[[pageVisibility]]" |
| 71 show-android-apps="[[showAndroidApps]]" |
71 on-subpage-expand="onSubpageExpand_"> | 72 on-subpage-expand="onSubpageExpand_"> |
72 </settings-basic-page> | 73 </settings-basic-page> |
73 </template> | 74 </template> |
74 <template is="dom-if" | 75 <template is="dom-if" |
75 if="[[showAdvancedSettings_(pageVisibility.advancedSettings)]]"> | 76 if="[[showAdvancedSettings_(pageVisibility.advancedSettings)]]"> |
76 <template is="dom-if" if="[[showAdvancedToggle_( | 77 <template is="dom-if" if="[[showAdvancedToggle_( |
77 showPages_.basic, hasExpandedSection_, inSearchMode_)]]"> | 78 showPages_.basic, hasExpandedSection_, inSearchMode_)]]"> |
78 <div id="toggleSpacer"></div> | 79 <div id="toggleSpacer"></div> |
79 <h2 id="toggleContainer"> | 80 <h2 id="toggleContainer"> |
80 <paper-button id="advancedToggle" active="{{advancedToggleExpanded}}" | 81 <paper-button id="advancedToggle" active="{{advancedToggleExpanded}}" |
(...skipping 13 matching lines...) Expand all Loading... |
94 </template> | 95 </template> |
95 </template> | 96 </template> |
96 <template is="dom-if" if="[[showPages_.about]]"> | 97 <template is="dom-if" if="[[showPages_.about]]"> |
97 <settings-about-page></settings-about-page> | 98 <settings-about-page></settings-about-page> |
98 </template> | 99 </template> |
99 <div id="overscroll" style="padding-bottom: [[overscroll_]]px"></div> | 100 <div id="overscroll" style="padding-bottom: [[overscroll_]]px"></div> |
100 </template> | 101 </template> |
101 <script src="settings_main.js"></script> | 102 <script src="settings_main.js"></script> |
102 <script src="/search_settings.js"></script> | 103 <script src="/search_settings.js"></script> |
103 </dom-module> | 104 </dom-module> |
OLD | NEW |