summaryrefslogtreecommitdiffstats
path: root/content/browser/resources
diff options
context:
space:
mode:
authorjsbell@chromium.org <jsbell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-10 23:28:21 +0000
committerjsbell@chromium.org <jsbell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-10 23:28:21 +0000
commit5a3cac4984e85e5dcdae1dfe8e2588c723261bee (patch)
treedf05b5d9ccab99b307b9b4214164d6e63c602fa2 /content/browser/resources
parentb8868be64401bc3d035d2cb7df3ce44ebf60e1a5 (diff)
downloadchromium_src-5a3cac4984e85e5dcdae1dfe8e2588c723261bee.zip
chromium_src-5a3cac4984e85e5dcdae1dfe8e2588c723261bee.tar.gz
chromium_src-5a3cac4984e85e5dcdae1dfe8e2588c723261bee.tar.bz2
Indicate incognito in Service Worker and IndexedDB internals pages
Both internals pages were displaying the partition path, which is bogus when in Incognito mode - both just store everything in memory. Track and pass the state along from context -> internals helper -> JS -> HTML and show a label instead. (Screenshots in the bug.) BUG=388168 R=michaeln@chromium.org Review URL: https://codereview.chromium.org/388583003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282460 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/resources')
-rw-r--r--content/browser/resources/indexed_db/indexeddb_internals.html10
-rw-r--r--content/browser/resources/service_worker/serviceworker_internals.html11
2 files changed, 15 insertions, 6 deletions
diff --git a/content/browser/resources/indexed_db/indexeddb_internals.html b/content/browser/resources/indexed_db/indexeddb_internals.html
index bf7fa1c..f389e9f 100644
--- a/content/browser/resources/indexed_db/indexeddb_internals.html
+++ b/content/browser/resources/indexed_db/indexeddb_internals.html
@@ -13,8 +13,13 @@
<div id="indexeddb-list-template"
jsvalues="$partition_path:$this.partition_path">
<div class="indexeddb-summary">
- <span>Instances in: </span>
- <span jscontent="$this.partition_path"></span>
+ <span jsdisplay="$this.partition_path">
+ <span>Instances in: </span>
+ <span jscontent="$this.partition_path"></span>
+ </span>
+ <span jsdisplay="!$this.partition_path">
+ <span>Instances: Incognito </span>
+ </span>
<span jscontent="'(' + $this.idbs.length + ')'"></span>
</div>
<div class="indexeddb-item" jsselect="$this.idbs">
@@ -181,4 +186,3 @@
<script src="chrome://resources/js/i18n_template2.js"></script>
</body>
</html>
-
diff --git a/content/browser/resources/service_worker/serviceworker_internals.html b/content/browser/resources/service_worker/serviceworker_internals.html
index 85e7045..913811a 100644
--- a/content/browser/resources/service_worker/serviceworker_internals.html
+++ b/content/browser/resources/service_worker/serviceworker_internals.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
<html i18n-values="dir:textdirection;">
<head>
<meta charset="utf-8">
@@ -97,8 +97,13 @@
jsvalues="$partition_id:$this.partition_id;.partition_id:$this.partition_id"
jsdisplay="$this.stored_registrations.length + $this.unregistered_registrations.length + $this.unregistered_versions.length > 0">
<div class="serviceworker-summary">
- <span>Registrations in: </span>
- <span jscontent="$this.partition_path"></span>
+ <span jsdisplay="$this.partition_path">
+ <span>Registrations in: </span>
+ <span jscontent="$this.partition_path"></span>
+ </span>
+ <span jsdisplay="!$this.partition_path">
+ <span>Registrations: Incognito </span>
+ </span>
<span jscontent="'(' + $this.stored_registrations.length + ')'"></span>
</div>
<div class="serviceworker-item" jsselect="$this.stored_registrations">