Index: chrome/browser/resources/settings/settings_ui/settings_ui.html |
diff --git a/chrome/browser/resources/settings/settings_ui/settings_ui.html b/chrome/browser/resources/settings/settings_ui/settings_ui.html |
index 07c16f4fbfda19af9778968eeeda9cfe916661ca..554538f453dd6f9829b0a129314addde5585f3c9 100644 |
--- a/chrome/browser/resources/settings/settings_ui/settings_ui.html |
+++ b/chrome/browser/resources/settings/settings_ui/settings_ui.html |
@@ -117,6 +117,7 @@ |
<!-- TODO(dpapad): Remove "coming soon" string once crbug.com/608535 fully |
addressed --> |
<cr-toolbar page-name="$i18n{settings}" |
+ hide-search="[[pageVisibility_.hideToolbarSearchField]]" |
dpapad
2016/07/21 18:33:33
Did you move the cr-toolbar changes to a different
Moe
2016/07/22 16:59:56
done.
|
clear-label="$i18n{clearSearch}" search-prompt="$i18n{searchPrompt} |
(coming soon!)" on-cr-menu-tap="onMenuButtonTap_" |
spinner-active="[[toolbarSpinnerActive_]]"> |
@@ -124,13 +125,15 @@ |
<app-drawer swipe-open> |
<div class="drawer-header">$i18n{settings}</div> |
<div class="drawer-content"> |
- <settings-menu current-route="{{currentRoute}}" id="sideNav"> |
+ <settings-menu current-route="{{currentRoute}}" id="sideNav" |
+ page-visibility="[[pageVisibility_]]"> |
</settings-menu> |
</div> |
</app-drawer> |
<paper-header-panel mode="waterfall"> |
<settings-main prefs="{{prefs}}" current-route="{{currentRoute}}" |
- toolbar-spinner-active="{{toolbarSpinnerActive_}}"> |
+ toolbar-spinner-active="{{toolbarSpinnerActive_}}" |
+ page-visibility="[[pageVisibility_]]"> |
</settings-main> |
</paper-header-panel> |