Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7319)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/common/extensions/docs/contentSettings.html

Issue 10829301: Extension docs: Manual merge crrev.com/143652 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1180/src/
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/extensions/docs/browsingData.html ('k') | chrome/common/extensions/docs/contextMenus.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/docs/contentSettings.html
===================================================================
--- chrome/common/extensions/docs/contentSettings.html (revision 151318)
+++ chrome/common/extensions/docs/contentSettings.html (working copy)
@@ -242,23 +242,23 @@
<a href="#types">Types</a>
<ol>
<li>
- <a href="#type-ResourceIdentifier">null</a>
+ <a href="#type-contentSettings.ResourceIdentifier">ResourceIdentifier</a>
<ol>
</ol>
</li><li>
- <a href="#type-ContentSetting">null</a>
+ <a href="#type-contentSettings.ContentSetting">ContentSetting</a>
<ol>
<li>
- <a href="#global-ContentSetting-methods">Methods</a>
+ <a href="#global-contentSettings.ContentSetting-methods">Methods</a>
<ol>
<li>
- <a href="#method-ContentSetting-clear">clear</a>
+ <a href="#method-contentSettings.ContentSetting-clear">clear</a>
</li><li>
- <a href="#method-ContentSetting-get">get</a>
+ <a href="#method-contentSettings.ContentSetting-get">get</a>
</li><li>
- <a href="#method-ContentSetting-getResourceIdentifiers">getResourceIdentifiers</a>
+ <a href="#method-contentSettings.ContentSetting-getResourceIdentifiers">getResourceIdentifiers</a>
</li><li>
- <a href="#method-ContentSetting-set">set</a>
+ <a href="#method-contentSettings.ContentSetting-set">set</a>
</li>
</ol>
</li>
@@ -441,7 +441,7 @@
(
<span id="typeTemplate">
<span>
- <a href="contentSettings.html#type-ContentSetting">ContentSetting</a>
+ <a href="contentSettings.html#type-contentSettings.ContentSetting">contentSettings.ContentSetting</a>
</span>
</span>
)
@@ -470,7 +470,7 @@
(
<span id="typeTemplate">
<span>
- <a href="contentSettings.html#type-ContentSetting">ContentSetting</a>
+ <a href="contentSettings.html#type-contentSettings.ContentSetting">contentSettings.ContentSetting</a>
</span>
</span>
)
@@ -499,7 +499,7 @@
(
<span id="typeTemplate">
<span>
- <a href="contentSettings.html#type-ContentSetting">ContentSetting</a>
+ <a href="contentSettings.html#type-contentSettings.ContentSetting">contentSettings.ContentSetting</a>
</span>
</span>
)
@@ -528,7 +528,7 @@
(
<span id="typeTemplate">
<span>
- <a href="contentSettings.html#type-ContentSetting">ContentSetting</a>
+ <a href="contentSettings.html#type-contentSettings.ContentSetting">contentSettings.ContentSetting</a>
</span>
</span>
)
@@ -557,7 +557,7 @@
(
<span id="typeTemplate">
<span>
- <a href="contentSettings.html#type-ContentSetting">ContentSetting</a>
+ <a href="contentSettings.html#type-contentSettings.ContentSetting">contentSettings.ContentSetting</a>
</span>
</span>
)
@@ -586,7 +586,7 @@
(
<span id="typeTemplate">
<span>
- <a href="contentSettings.html#type-ContentSetting">ContentSetting</a>
+ <a href="contentSettings.html#type-contentSettings.ContentSetting">contentSettings.ContentSetting</a>
</span>
</span>
)
@@ -611,8 +611,8 @@
<h3 id="types">Types</h3>
<!-- iterates over all types -->
<div class="apiItem">
- <a name="type-ResourceIdentifier"></a>
- <h4>ResourceIdentifier</h4>
+ <a name="type-contentSettings.ResourceIdentifier"></a>
+ <h4>contentSettings.ResourceIdentifier</h4>
<div>
<dt>
<em>
@@ -687,8 +687,8 @@
<!-- FUNCTION PARAMETERS -->
</div>
</div><div class="apiItem">
- <a name="type-ContentSetting"></a>
- <h4>ContentSetting</h4>
+ <a name="type-contentSettings.ContentSetting"></a>
+ <h4>contentSettings.ContentSetting</h4>
<div>
<dt>
<em>
@@ -711,15 +711,15 @@
<!-- OBJECT METHODS -->
<dd>
<div class="apiGroup">
- <a name="global-ContentSetting-methods"></a>
- <h3>Methods of ContentSetting</h3>
+ <a name="global-contentSettings.ContentSetting-methods"></a>
+ <h3>Methods of contentSettings.ContentSetting</h3>
<!-- iterates over all functions -->
<div class="apiItem">
- <a name="method-ContentSetting-clear"></a> <!-- method-anchor -->
+ <a name="method-contentSettings.ContentSetting-clear"></a> <!-- method-anchor -->
<h4>clear</h4>
<div class="summary">
<!-- Note: intentionally longer 80 columns -->
- <span>contentSetting.clear</span>(<span class="null"><span>object</span>
+ <span>contentSettings.ContentSetting.clear</span>(<span class="null"><span>object</span>
<var><span>details</span></var></span><span class="optional"><span>, </span><span>function</span>
<var><span>callback</span></var></span>)</div>
<div class="description">
@@ -818,11 +818,11 @@
<!-- MIN_VERSION -->
</div> <!-- /description -->
</div><div class="apiItem">
- <a name="method-ContentSetting-get"></a> <!-- method-anchor -->
+ <a name="method-contentSettings.ContentSetting-get"></a> <!-- method-anchor -->
<h4>get</h4>
<div class="summary">
<!-- Note: intentionally longer 80 columns -->
- <span>contentSetting.get</span>(<span class="null"><span>object</span>
+ <span>contentSettings.ContentSetting.get</span>(<span class="null"><span>object</span>
<var><span>details</span></var></span><span class="null"><span>, </span><span>function</span>
<var><span>callback</span></var></span>)</div>
<div class="description">
@@ -911,7 +911,7 @@
<span class="optional">optional</span>
<span id="typeTemplate">
<span>
- <a href="contentSettings.html#type-ResourceIdentifier">ResourceIdentifier</a>
+ <a href="contentSettings.html#type-contentSettings.ResourceIdentifier">contentSettings.ResourceIdentifier</a>
</span>
</span>
)
@@ -989,11 +989,11 @@
<!-- MIN_VERSION -->
</div> <!-- /description -->
</div><div class="apiItem">
- <a name="method-ContentSetting-getResourceIdentifiers"></a> <!-- method-anchor -->
+ <a name="method-contentSettings.ContentSetting-getResourceIdentifiers"></a> <!-- method-anchor -->
<h4>getResourceIdentifiers</h4>
<div class="summary">
<!-- Note: intentionally longer 80 columns -->
- <span>contentSetting.getResourceIdentifiers</span>(<span class="null"><span>function</span>
+ <span>contentSettings.ContentSetting.getResourceIdentifiers</span>(<span class="null"><span>function</span>
<var><span>callback</span></var></span>)</div>
<div class="description">
<p class="todo">Undocumented.</p>
@@ -1034,11 +1034,11 @@
<!-- MIN_VERSION -->
</div> <!-- /description -->
</div><div class="apiItem">
- <a name="method-ContentSetting-set"></a> <!-- method-anchor -->
+ <a name="method-contentSettings.ContentSetting-set"></a> <!-- method-anchor -->
<h4>set</h4>
<div class="summary">
<!-- Note: intentionally longer 80 columns -->
- <span>contentSetting.set</span>(<span class="null"><span>object</span>
+ <span>contentSettings.ContentSetting.set</span>(<span class="null"><span>object</span>
<var><span>details</span></var></span><span class="optional"><span>, </span><span>function</span>
<var><span>callback</span></var></span>)</div>
<div class="description">
@@ -1127,7 +1127,7 @@
<span class="optional">optional</span>
<span id="typeTemplate">
<span>
- <a href="contentSettings.html#type-ResourceIdentifier">ResourceIdentifier</a>
+ <a href="contentSettings.html#type-contentSettings.ResourceIdentifier">contentSettings.ResourceIdentifier</a>
</span>
</span>
)
« no previous file with comments | « chrome/common/extensions/docs/browsingData.html ('k') | chrome/common/extensions/docs/contextMenus.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698