chrome/common/extensions/docs/experimental.contentSettings.misc.html - Issue 6992022: Move Proxy Settings API out of experimental

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 6992022: Move Proxy Settings API out of experimental (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Removed remainder of merge conflict. Fixes unit test Created 9 years, 7 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

Index: chrome/common/extensions/docs/experimental.contentSettings.misc.html

diff --git a/chrome/common/extensions/docs/experimental.contentSettings.misc.html b/chrome/common/extensions/docs/experimental.contentSettings.misc.html

index 37708b3daaed253079e0b79379e68114d20b75e4..dd42a43104a686599aafab8b625755966cb44272 100644

--- a/chrome/common/extensions/docs/experimental.contentSettings.misc.html

+++ b/chrome/common/extensions/docs/experimental.contentSettings.misc.html

@@ -347,7 +347,7 @@

enumerated

- <a href="experimental.extension.html#type-Preference">Preference</a>

+ <a href="preferences.html#type-Preference">Preference</a>

@@ -421,7 +421,7 @@

enumerated

- <a href="experimental.extension.html#type-Preference">Preference</a>

+ <a href="preferences.html#type-Preference">Preference</a>

@@ -495,7 +495,7 @@

enumerated

- <a href="experimental.extension.html#type-Preference">Preference</a>

+ <a href="preferences.html#type-Preference">Preference</a>

« no previous file with comments | « chrome/common/extensions/docs/experimental.html ('k') | chrome/common/extensions/docs/experimental.extension.html » ('j') | no next file with comments »