DOMUI: Remove an errant conditional that kept the 'Reset to defaults' button

from being shown on ChromeOS.

BUG=54145
TEST=none

Review URL: http://codereview.chromium.org/3731004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62347 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 11 insertions, 9 deletions

diff --git a/chrome/browser/resources/options/advanced_options.html b/chrome/browser/resources/options/advanced_options.html
index 7a7acee..13d1ea7 100644
--- a/chrome/browser/resources/options/advanced_options.html
+++ b/chrome/browser/resources/options/advanced_options.html
@@ -145,7 +145,6 @@
 </if>
     </div>
   </section>
-<if expr="not pp_ifdef('chromeos')">
   <section id="background-mode-section">
     <h3 i18n-content="advancedSectionTitleChromeApps"></h3>
     <div>
@@ -164,5 +163,4 @@
   <div class="button-strip">
     <button id="optionsReset" i18n-content="optionsReset"></button>
   </div>
-</if>
 </div>
diff --git a/chrome/browser/resources/options/advanced_options.js b/chrome/browser/resources/options/advanced_options.js
index dabb324..58e9fde 100644
--- a/chrome/browser/resources/options/advanced_options.js
+++ b/chrome/browser/resources/options/advanced_options.js
@@ -39,6 +39,7 @@ var OptionsPage = options.OptionsPage;
         OptionsPage.showOverlay('clearBrowserDataOverlay');
         chrome.send('coreOptionsUserMetricsAction', ['Options_ClearData']);
       };
+
       // 'metricsReportingEnabled' element is only present on Chrome branded
       // builds.
       if ($('metricsReportingEnabled')) {
@@ -47,6 +48,7 @@ var OptionsPage = options.OptionsPage;
               [String(event.target.checked)]);
         };
       }
+
       $('autoOpenFileTypesResetToDefault').onclick = function(event) {
         chrome.send('autoOpenFileTypesAction');
       };
@@ -54,6 +56,14 @@ var OptionsPage = options.OptionsPage;
         OptionsPage.showPageByName('fontSettings');
         chrome.send('coreOptionsUserMetricsAction', ['Options_FontSettings']);
       };
+      $('optionsReset').onclick = function(event) {
+        AlertOverlay.show(undefined,
+            localStrings.getString('optionsResetMessage'),
+            localStrings.getString('optionsResetOkLabel'),
+            localStrings.getString('optionsResetCancelLabel'),
+            function() { chrome.send('resetToDefaults'); });
+      }
+
       if (cr.isWindows || cr.isMac) {
         $('certificatesManageButton').onclick = function(event) {
           chrome.send('showManageSSLCertificates');
@@ -66,14 +76,8 @@ var OptionsPage = options.OptionsPage;
                       ['Options_ManageSSLCertificates']);
         };
       }
+
       if (!cr.isChromeOS) {
-        $('optionsReset').onclick = function(event) {
-          AlertOverlay.show(undefined,
-              localStrings.getString('optionsResetMessage'),
-              localStrings.getString('optionsResetOkLabel'),
-              localStrings.getString('optionsResetCancelLabel'),
-              function() { chrome.send('resetToDefaults'); });
-        }
         $('proxiesConfigureButton').onclick = function(event) {
           chrome.send('showNetworkProxySettings');
         };