Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / resources / options / options.html

diff --git a/src/chrome/browser/resources/options/options.html b/src/chrome/browser/resources/options/options.html
index 356ae99..e379297 100644 (file)
--- a/src/chrome/browser/resources/options/options.html
+++ b/src/chrome/browser/resources/options/options.html
@@ -50,7 +50,7 @@
 <link rel="stylesheet" href="supervised_user_learn_more.css">
 <link rel="stylesheet" href="website_settings.css">
 <link rel="stylesheet" href="../help/help_content.css">
-<link rel="stylesheet" href="../sync_setup_overlay.css">
+<link rel="stylesheet" href="sync_setup_overlay.css">
 <if expr="chromeos">
 <link rel="stylesheet" href="chromeos/third_party_ime_confirm_overlay.css">
 <link rel="stylesheet" href="chromeos/accounts_options_page.css">
@@ -73,6 +73,7 @@
 <link rel="stylesheet" href="options_settings_app.css">
 </if>
 <script src="chrome://resources/css/tree.css.js"></script>
+<script src="chrome://resources/js/action_link.js"></script>
 <script src="chrome://resources/js/cr.js"></script>
 <script src="chrome://resources/js/event_tracker.js"></script>
 <script src="chrome://resources/js/cr/event_target.js"></script>
@@ -127,7 +128,7 @@
   <include src="startup_overlay.html">
   <include src="supervised_user_create_confirm.html">
   <include src="../help/help_page.html">
-  <include src="../sync_setup_overlay.html">
+  <include src="sync_setup_overlay.html">
 <if expr="chromeos">
   <include src="chromeos/accounts_options.html">
   <include src="chromeos/bluetooth_add_device_overlay.html">
@@ -137,6 +138,7 @@
   <include src="chromeos/display_options.html">
   <include src="chromeos/keyboard_overlay.html">
   <include src="chromeos/pointer_overlay.html">
+  <include src="chromeos/power_overlay.html">
   <include src="factory_reset_overlay.html">
 </if>
 <if expr="use_nss">
@@ -179,8 +181,8 @@
     <div class="controlled-setting-bubble-extension-name"></div>
   </div>
   <div class="controlled-setting-bubble-content-row">
-    <button class="controlled-setting-bubble-extension-manage-link link-button"
-        i18n-content="controlledSettingManageExtension"></button>
+    <a is="action-link" class="controlled-setting-bubble-extension-manage-link"
+        i18n-content="controlledSettingManageExtension"></a>
     <button class='controlled-setting-bubble-extension-disable-button'
         i18n-content="controlledSettingDisableExtension"></button>
   </div>