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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 show-android-apps="[[showAndroidApps]]" |
72 on-subpage-expand="onSubpageExpand_"> | 72 on-subpage-expand="onSubpageExpand_" |
| 73 in-search-mode="[[inSearchMode_]]"> |
73 </settings-basic-page> | 74 </settings-basic-page> |
74 </template> | 75 </template> |
75 <template is="dom-if" | 76 <template is="dom-if" |
76 if="[[showAdvancedSettings_(pageVisibility.advancedSettings)]]"> | 77 if="[[showAdvancedSettings_(pageVisibility.advancedSettings)]]"> |
77 <template is="dom-if" if="[[showAdvancedToggle_( | 78 <template is="dom-if" if="[[showAdvancedToggle_( |
78 showPages_.basic, hasExpandedSection_, inSearchMode_)]]"> | 79 showPages_.basic, hasExpandedSection_, inSearchMode_)]]"> |
79 <div id="toggleSpacer"></div> | 80 <div id="toggleSpacer"></div> |
80 <h2 id="toggleContainer"> | 81 <h2 id="toggleContainer"> |
81 <paper-button id="advancedToggle" active="{{advancedToggleExpanded}}" | 82 <paper-button id="advancedToggle" active="{{advancedToggleExpanded}}" |
82 aria-active-attribute="aria-expanded" toggles> | 83 aria-active-attribute="aria-expanded" toggles> |
83 <span>$i18n{advancedPageTitle}</span> | 84 <span>$i18n{advancedPageTitle}</span> |
84 <iron-icon icon="[[arrowState_(advancedToggleExpanded)]]"> | 85 <iron-icon icon="[[arrowState_(advancedToggleExpanded)]]"> |
85 </iron-icon> | 86 </iron-icon> |
86 </paper-button> | 87 </paper-button> |
87 </h2> | 88 </h2> |
88 </template> | 89 </template> |
89 <template is="dom-if" if="[[showAdvancedPage_( | 90 <template is="dom-if" if="[[showAdvancedPage_( |
90 showPages_.advanced, inSearchMode_, hasExpandedSection_)]]"> | 91 showPages_.advanced, inSearchMode_, hasExpandedSection_)]]"> |
91 <settings-advanced-page prefs="{{prefs}}" | 92 <settings-advanced-page prefs="{{prefs}}" |
92 page-visibility="[[pageVisibility]]" | 93 page-visibility="[[pageVisibility]]" |
93 on-subpage-expand="onSubpageExpand_"> | 94 on-subpage-expand="onSubpageExpand_" |
| 95 in-search-mode="[[inSearchMode_]]"> |
94 </settings-advanced-page> | 96 </settings-advanced-page> |
95 </template> | 97 </template> |
96 </template> | 98 </template> |
97 <template is="dom-if" if="[[showPages_.about]]"> | 99 <template is="dom-if" if="[[showPages_.about]]"> |
98 <settings-about-page></settings-about-page> | 100 <settings-about-page in-search-mode="[[inSearchMode_]]"> |
| 101 </settings-about-page> |
99 </template> | 102 </template> |
100 <div id="overscroll" style="padding-bottom: [[overscroll_]]px"></div> | 103 <div id="overscroll" style="padding-bottom: [[overscroll_]]px"></div> |
101 </template> | 104 </template> |
102 <script src="settings_main.js"></script> | 105 <script src="settings_main.js"></script> |
103 <script src="/search_settings.js"></script> | 106 <script src="/search_settings.js"></script> |
104 </dom-module> | 107 </dom-module> |
OLD | NEW |