| Index: chrome/browser/resources/settings/search_engines_page/search_engine_dialog.html | 
| diff --git a/chrome/browser/resources/settings/search_engines_page/search_engine_dialog.html b/chrome/browser/resources/settings/search_engines_page/search_engine_dialog.html | 
| index e5997ad9486654dff267830f5504d8f359567dc6..b914c91d0ebf3ec40a5addd2a88c2515a7ef478a 100644 | 
| --- a/chrome/browser/resources/settings/search_engines_page/search_engine_dialog.html | 
| +++ b/chrome/browser/resources/settings/search_engines_page/search_engine_dialog.html | 
| @@ -2,52 +2,41 @@ | 
| <link rel="import" href="chrome://md-settings/i18n_setup.html"> | 
| <link rel="import" href="chrome://md-settings/search_engines_page/search_engines_browser_proxy.html"> | 
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html"> | 
| -<link rel="import" href="chrome://resources/polymer/v1_0/paper-dialog/paper-dialog.html"> | 
| -<link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button.html"> | 
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input.html"> | 
| <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html"> | 
| -<link rel="import" href="chrome://md-settings/settings_dialog_css.html"> | 
| +<link rel="import" href="chrome://md-settings/settings_dialog.html"> | 
| <link rel="import" href="chrome://md-settings/settings_shared_css.html"> | 
|  | 
| <dom-module id="settings-search-engine-dialog"> | 
| <template> | 
| -    <style include="settings-dialog"></style> | 
| <style include="settings-shared"></style> | 
| -    <paper-dialog modal id="dialog"> | 
| -      <div id="dialog-content"> | 
| -        <div class="top-row"> | 
| -          <span class="title">[[dialogTitle_]]</span> | 
| -          <paper-icon-button icon="clear" on-tap="cancel_" id="close"> | 
| -          </paper-icon-button> | 
| -        </div> | 
| -        <div class="body"> | 
| -          <div class="explanation"> | 
| -            <paper-input always-float-label id="searchEngine" | 
| -                i18n-values="label:searchEnginesSearchEngine;error-message:searchEnginesNotValid" | 
| -                value="{{searchEngine_}}" on-focus="validate_" | 
| -                on-input="validate_"> | 
| -            </paper-input> | 
| -            <paper-input always-float-label id="keyword" | 
| -                i18n-values="label:searchEnginesKeyword;error-message:searchEnginesNotValid" | 
| -                value="{{keyword_}}" on-focus="validate_" on-input="validate_"> | 
| -            </paper-input> | 
| -            <paper-input always-float-label id="queryUrl" | 
| -                i18n-values="label:searchEnginesQueryURLExplanation;error-message:searchEnginesNotValid" | 
| -                value="{{queryUrl_}}" on-focus="validate_" on-input="validate_" | 
| -                disabled$="[[model.urlLocked]]"> | 
| -            </paper-input> | 
| -          </div> | 
| -          <div class="button-container"> | 
| -            <paper-button class="cancel-button" on-tap="cancel_" | 
| -                i18n-content="cancel" id="cancel"></paper-button> | 
| -            <paper-button id="actionButton" class="action-button" | 
| -                on-tap="onActionButtonTap_"> | 
| -              [[actionButtonText_]] | 
| -            </paper-button> | 
| -          </div> | 
| -        </div> | 
| +    <settings-dialog id="dialog"> | 
| +      <div class="title">[[dialogTitle_]]</div> | 
| +      <div class="body"> | 
| +        <paper-input always-float-label id="searchEngine" | 
| +            i18n-values="label:searchEnginesSearchEngine;error-message:searchEnginesNotValid" | 
| +            value="{{searchEngine_}}" on-focus="validate_" | 
| +            on-input="validate_"> | 
| +        </paper-input> | 
| +        <paper-input always-float-label id="keyword" | 
| +            i18n-values="label:searchEnginesKeyword;error-message:searchEnginesNotValid" | 
| +            value="{{keyword_}}" on-focus="validate_" on-input="validate_"> | 
| +        </paper-input> | 
| +        <paper-input always-float-label id="queryUrl" | 
| +            i18n-values="label:searchEnginesQueryURLExplanation;error-message:searchEnginesNotValid" | 
| +            value="{{queryUrl_}}" on-focus="validate_" on-input="validate_" | 
| +            disabled$="[[model.urlLocked]]"> | 
| +        </paper-input> | 
| </div> | 
| -    </paper-dialog> | 
| +      <div class="button-container"> | 
| +        <paper-button class="cancel-button" on-tap="cancel_" | 
| +            i18n-content="cancel" id="cancel"></paper-button> | 
| +        <paper-button id="actionButton" class="action-button" | 
| +            on-tap="onActionButtonTap_"> | 
| +          [[actionButtonText_]] | 
| +        </paper-button> | 
| +      </div> | 
| +    </settings-dialog> | 
| </template> | 
| <script src="search_engine_dialog.js"></script> | 
| </dom-module> | 
|  |