diff options
| author | kathyw@chromium.org <kathyw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-03 00:46:12 +0000 |
|---|---|---|
| committer | kathyw@chromium.org <kathyw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-03 00:46:12 +0000 |
| commit | 42417f11d4e6fcb13c80972ddd8e9316c2cbb7d6 (patch) | |
| tree | 73074c46e8c42f195d029fb6d822d0c1023a95b8 | |
| parent | 2979056186493a0275bb1b67b1f9c391ad064398 (diff) | |
| download | chromium_src-42417f11d4e6fcb13c80972ddd8e9316c2cbb7d6.zip chromium_src-42417f11d4e6fcb13c80972ddd8e9316c2cbb7d6.tar.gz chromium_src-42417f11d4e6fcb13c80972ddd8e9316c2cbb7d6.tar.bz2 | |
Merge 76674 - Say that file: access requires user opt-in.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6576036
TBR=kathyw@chromium.org
Review URL: http://codereview.chromium.org/6614002
git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@76686 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/common/extensions/docs/match_patterns.html | 9 | ||||
| -rw-r--r-- | chrome/common/extensions/docs/static/match_patterns.html | 9 |
2 files changed, 16 insertions, 2 deletions
diff --git a/chrome/common/extensions/docs/match_patterns.html b/chrome/common/extensions/docs/match_patterns.html index ddbc56b..43f3e85 100644 --- a/chrome/common/extensions/docs/match_patterns.html +++ b/chrome/common/extensions/docs/match_patterns.html @@ -330,6 +330,12 @@ Each match pattern has 3 parts:</p> <li> <em>scheme</em> — for example, <code>http</code> or <code>file</code> or <code>*</code> + <p class="note"> + <b>Note:</b> + Access to <code>file</code> URLs isn't automatic. + The user must visit the extensions management page + and opt in to <code>file</code> access for each extension that requests it. + </p> </li> <li> <em>host</em> — for example, <code>www.google.com</code> @@ -439,7 +445,8 @@ The following table shows some valid patterns. <code>file:///foo*</code> </td> - <td>Matches any local file whose path starts with <code>/foo</code></td> + <td>Matches any local file whose path starts with <code>/foo</code> + </td> <td> file:///foo/bar.html<br> diff --git a/chrome/common/extensions/docs/static/match_patterns.html b/chrome/common/extensions/docs/static/match_patterns.html index f0dc41b..24a8c89 100644 --- a/chrome/common/extensions/docs/static/match_patterns.html +++ b/chrome/common/extensions/docs/static/match_patterns.html @@ -26,6 +26,12 @@ Each match pattern has 3 parts:</p> <li> <em>scheme</em> — for example, <code>http</code> or <code>file</code> or <code>*</code> + <p class="note"> + <b>Note:</b> + Access to <code>file</code> URLs isn't automatic. + The user must visit the extensions management page + and opt in to <code>file</code> access for each extension that requests it. + </p> </li> <li> <em>host</em> — for example, <code>www.google.com</code> @@ -136,7 +142,8 @@ The following table shows some valid patterns. <code>file:///foo*</code> </td> - <td>Matches any local file whose path starts with <code>/foo</code></td> + <td>Matches any local file whose path starts with <code>/foo</code> + </td> <td> file:///foo/bar.html<br> |