Update To 11.40.268.0

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

diff --git a/src/chrome/browser/resources/extensions/extensions.html b/src/chrome/browser/resources/extensions/extensions.html
index 3a64f5c..b7b2ff8 100644 (file)
--- a/src/chrome/browser/resources/extensions/extensions.html
+++ b/src/chrome/browser/resources/extensions/extensions.html
@@ -8,6 +8,7 @@
 <link rel="stylesheet" href="extension_error.css">
 <link rel="stylesheet" href="extension_error_overlay.css">
 <link rel="stylesheet" href="extension_load_error.css">
+<link rel="stylesheet" href="extension_options_overlay.css">
 <link rel="stylesheet" href="pack_extension_overlay.css">
 <link rel="stylesheet" href="chrome://resources/css/alert_overlay.css">
 <link rel="stylesheet" href="chrome://resources/css/chrome_shared.css">
@@ -15,6 +16,7 @@
 <link rel="stylesheet" href="chrome://resources/css/trash.css">
 <link rel="stylesheet" href="../uber/uber_shared.css">
 
+<script src="chrome://resources/js/action_link.js"></script>
 <script src="chrome://resources/js/cr.js"></script>
 <script src="chrome://resources/js/load_time_data.js"></script>
 <script src="chrome://resources/js/util.js"></script>
@@ -47,6 +49,7 @@
 <div id="overlay" class="overlay" hidden>
   <include src="extension_commands_overlay.html">
   <include src="extension_error_overlay.html">
+  <include src="extension_options_overlay.html">
   <include src="pack_extension_overlay.html">
   <include src="../../../../ui/webui/resources/html/alert_overlay.html">
 <if expr="chromeos">
@@ -68,10 +71,10 @@
         </label>
       </div>
     </div>
-    <div class="page-banner profile-is-managed-banner">
+    <div class="page-banner profile-is-supervised-banner">
       <div class="page-banner-gradient">
         <span class="page-banner-text"
-            i18n-content="extensionSettingsManagedMode"></span>
+            i18n-content="extensionSettingsSupervisedUser"></span>
       </div>
     </div>
   </header>
@@ -113,10 +116,8 @@
     <a target="_blank" class="more-extensions-link"
         i18n-values="href:extensionSettingsGetMoreExtensionsUrl"
         i18n-content="extensionSettingsGetMoreExtensions"></a>
-    <a target="_blank" hidden
-        class="extension-commands-config"
-        i18n-content="extensionSettingsCommandsLink"
-        href="#"></a>
+    <a is="action-link" class="extension-commands-config"
+        i18n-content="extensionSettingsCommandsLink" hidden></a>
   </div>
 </div>
 
@@ -131,14 +132,22 @@
           <span class="extension-title"></span>
           <span class="extension-version"></span>
         </div>
-        <p class="extension-description">
-          <span></span>
-          <a class="permissions-link"
-              i18n-content="extensionSettingsPermissions"
-              href="#">
-          </a>
+        <p class="corrupt-install-message"
+           i18n-content="extensionSettingsCorruptInstall" hidden></p>
+        <p class="extension-description"></p>
+        <div class="action-links">
+          <a is="action-link" class="permissions-link"
+              i18n-content="extensionSettingsPermissions"></a>
+          <a is="action-link" class="options-button"
+              i18n-content="extensionSettingsOptions" hidden></a>
+          <a class="options-link"
+              i18n-content="extensionSettingsOptions" hidden></a>
           <a class="site-link" target="_parent" hidden></a>
-        </p>
+          <a is="action-link" class="launch-link"
+              i18n-content="extensionSettingsLaunch" hidden></a>
+          <a is="action-link" role="button" class="reload-link"
+              i18n-content="extensionSettingsReloadUnpacked" hidden></a>
+        </div>
         <div class="permanent-warnings">
           <div class="extension-warnings" hidden>
             <span i18n-content="extensionSettingsWarningsTitle"></span>
@@ -152,14 +161,10 @@
                 href="#">
             </a>
           </div>
-          <div class="corrupt-install-message" hidden>
-            <span i18n-content="extensionSettingsCorruptInstall"></span>
-            <a target="_blank" class="learn-more-link"
-                i18n-values="href:extensionSettingsCorruptInstallHelpUrl"
-                i18n-content="extensionSettingsLearnMore"
-                href="#">
-            </a>
-          </div>
+        </div>
+        <div class="dependent-extensions-message" hidden>
+          <span i18n-content="extensionSettingsDependentExtensions"></span>
+          <ul></ul>
         </div>
         <div class="developer-extras">
           <div>
@@ -168,14 +173,14 @@
           </div>
           <div class="load-path" hidden>
             <span i18n-content="extensionSettingsExtensionPath"></span>
-            <span></span>
+            <a is="action-link"></a>
           </div>
           <div class="managed-message"
               i18n-content="extensionSettingsPolicyControlled" hidden>
           </div>
           <div class="active-views" hidden>
             <span i18n-content="extensionSettingsInspectViews"></span>
-            <a href="#"></a>
+            <a is="action-link"></a>
           </div>
           <div class="manifest-errors" hidden></div>
           <div class="runtime-errors" hidden></div>
@@ -206,27 +211,22 @@
               <span i18n-content="extensionSettingsAllowOnAllUrls"></span>
             </label>
           </div>
-          <span class="optional-controls-disableable">
-            <label class="file-access-control" hidden>
+          <div class="checkbox file-access-control" hidden>
+            <label>
               <input type="checkbox">
               <span i18n-content="extensionSettingsAllowFileAccess"></span>
             </label>
-            <a class="reload-link"
-                i18n-content="extensionSettingsReloadUnpacked"
-                href="#" hidden></a>
-            <a class="launch-link" i18n-content="extensionSettingsLaunch"
-                href="#" hidden></a>
-          </span>
-          <a class="options-link" i18n-content="extensionSettingsOptions"
-              href="#" hidden></a>
+          </div>
         </div>
         <div class="butter-bar"
             i18n-values=".innerHTML:extensionSettingsIncognitoWarning" hidden>
         </div>
       </div>
       <div class="enable-controls">
-        <a class="terminated-reload-link" href="#"
+        <a is="action-link" role="button" class="terminated-reload-link"
             i18n-content="extensionSettingsReloadTerminated" hidden></a>
+        <a is="action-link" role="button" class="corrupted-repair-button"
+            i18n-content="extensionSettingsRepairCorrupted" hidden></a>
         <div class="checkbox enable-checkbox" hidden><label>
           <input type="checkbox">
           <span class="enable-checkbox-text">
@@ -242,6 +242,16 @@
       </div>
     </div>
   </div>
+  <li class="dependent-list-item">
+    <span class="dep-extension-title"></span>
+    <ul class="developer-extras">
+      <li>
+        <span i18n-content="extensionSettingsExtensionId"></span>
+        <span class="dep-extension-id"></span>
+      </li>
+    </ul>
+  </li>
+
 
   <include src="../../../../ui/webui/resources/html/trash.html">
   <include src="extension_error.html">