Upstream version 10.39.225.0

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

diff --git a/src/chrome/browser/resources/options/website_settings.html b/src/chrome/browser/resources/options/website_settings.html
index 663e7f0..8bd13db 100644 (file)
--- a/src/chrome/browser/resources/options/website_settings.html
+++ b/src/chrome/browser/resources/options/website_settings.html
@@ -1,25 +1,31 @@
 <div id="website-settings-page" class="page website-settings-page not-resizable"
     hidden>
   <div class="close-button"></div>
-  <h1 i18n-content="websiteSettingsPage"></h1>
-  <div class="content-area website-list-content-area">
+  <h1 id="website-settings-title" i18n-content="websiteSettingsPage"></h1>
+  <div id="website-list-content-area" class="content-area">
     <div class="website-column-headers">
+      <div id="website-settings-global-controls">
+        <div class="checkbox">
+          <label>
+            <input id="global-setting-toggle" type="checkbox">
+            <span i18n-content="websitesLabelOn"></span>
+          </label>
+        </div>
+        <select id="global-setting"></select>
+      </div>
       <div class="website-header-controls">
-        <select id="resourceType" class="resource-type-select">
-          <option value="geolocation" i18n-content="websitesLabelGeolocation">
-          </option>
-          <option value="media-stream" i18n-content="websitesLabelMediaStream">
-          </option>
-          <option value="notifications"
-              i18n-content="websitesLabelNotifications"></option>
-          <option value="storage"
-              i18n-content="websitesLabelStorage"></option>
-        </select>
+        <span id="allowed-origin-list-title"
+            i18n-content="websitesAllowedListTitle">
+        </span>
         <input type="search" id="website-settings-search-box"
             i18n-values="placeholder:websitesSearch" incremental>
       </div>
     </div>
-    <list id="origin-list" class="origin-list"></list>
+    <list id="allowed-origin-list" class="origin-list"></list>
+    <h2 id="blocked-origin-list-title" i18n-content="websitesBlockedListTitle">
+    </h2>
+    <list id="blocked-origin-list" class="blocked-origin-list origin-list">
+    </list>
   </div>
   <div class="action-area">
     <div class="button-strip">