diff options
| author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-22 22:31:09 +0000 |
|---|---|---|
| committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-22 22:31:09 +0000 |
| commit | b2477480c0605851d97dcbb84644e5a7a1599bc3 (patch) | |
| tree | fc45599ed7b02b2c7b070d54b7198d71af7d7c8d /chrome/common/extensions | |
| parent | 7bbc7d1ca0dd48a6383687324c4ebb6df7f6d9c5 (diff) | |
| download | chromium_src-b2477480c0605851d97dcbb84644e5a7a1599bc3.zip chromium_src-b2477480c0605851d97dcbb84644e5a7a1599bc3.tar.gz chromium_src-b2477480c0605851d97dcbb84644e5a7a1599bc3.tar.bz2 | |
Revert 128299 - Add callbacks to history.addUrl and history.deleteUrl
This CL seems to break HistoryExtensionApiTest.TimedSearch on Vista & Win7.
Added optional callbacks to addUrl and deleteUrl, and fixed
up some of the api tests to use them.
BUG=76170
TEST=*HistoryExtensionApiTest*
Review URL: http://codereview.chromium.org/9811017
TBR=cduvall@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9837024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128315 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions')
| -rw-r--r-- | chrome/common/extensions/api/history.json | 12 | ||||
| -rw-r--r-- | chrome/common/extensions/docs/history.html | 84 |
2 files changed, 2 insertions, 94 deletions
diff --git a/chrome/common/extensions/api/history.json b/chrome/common/extensions/api/history.json index b1d1b19..c2c0e62 100644 --- a/chrome/common/extensions/api/history.json +++ b/chrome/common/extensions/api/history.json @@ -93,12 +93,6 @@ "properties": { "url": {"type": "string", "description": "The URL to add."} } - }, - { - "name": "callback", - "type": "function", - "optional": true, - "parameters": [] } ] }, @@ -113,12 +107,6 @@ "properties": { "url": {"type": "string", "description": "The URL to remove."} } - }, - { - "name": "callback", - "type": "function", - "optional": true, - "parameters": [] } ] }, diff --git a/chrome/common/extensions/docs/history.html b/chrome/common/extensions/docs/history.html index 56fcbc2..ceffcca 100644 --- a/chrome/common/extensions/docs/history.html +++ b/chrome/common/extensions/docs/history.html @@ -421,8 +421,7 @@ For other examples and for help in viewing the source code, see <div class="summary"> <!-- Note: intentionally longer 80 columns --> <span>chrome.history.addUrl</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> + <var><span>details</span></var></span>)</div> <div class="description"> <p>Adds a URL to the history at the current time with a <a href="#transition_types">transition type</a> of "link".</p> <!-- PARAMETERS --> @@ -481,51 +480,12 @@ For other examples and for help in viewing the source code, see <!-- OBJECT EVENT FIELDS --> <!-- FUNCTION PARAMETERS --> </div> - </div><div> - <div> - <dt> - <var>callback</var> - <em> - <!-- TYPE --> - <div style="display:inline"> - ( - <span class="optional">optional</span> - <span id="typeTemplate"> - <span> - <span>function</span> - </span> - </span> - ) - </div> - </em> - </dt> - <dd class="todo"> - Undocumented. - </dd> - <!-- OBJECT PROPERTIES --> - <!-- OBJECT METHODS --> - <!-- OBJECT EVENT FIELDS --> - <!-- FUNCTION PARAMETERS --> - </div> </div> </dl> <!-- RETURNS --> <dl> </dl> <!-- CALLBACK --> - <div> - <div> - <h4>Callback function</h4> - <p> - If you specify the <em>callback</em> parameter, it should - specify a function that looks like this: - </p> - <!-- Note: intentionally longer 80 columns --> - <pre>function(<span></span>) <span class="subdued">{...}</span>;</pre> - <dl> - </dl> - </div> - </div> <!-- MIN_VERSION --> </div> <!-- /description --> </div><div class="apiItem"> @@ -727,8 +687,7 @@ For other examples and for help in viewing the source code, see <div class="summary"> <!-- Note: intentionally longer 80 columns --> <span>chrome.history.deleteUrl</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> + <var><span>details</span></var></span>)</div> <div class="description"> <p>Removes all occurrences of the given URL from the history.</p> <!-- PARAMETERS --> @@ -787,51 +746,12 @@ For other examples and for help in viewing the source code, see <!-- OBJECT EVENT FIELDS --> <!-- FUNCTION PARAMETERS --> </div> - </div><div> - <div> - <dt> - <var>callback</var> - <em> - <!-- TYPE --> - <div style="display:inline"> - ( - <span class="optional">optional</span> - <span id="typeTemplate"> - <span> - <span>function</span> - </span> - </span> - ) - </div> - </em> - </dt> - <dd class="todo"> - Undocumented. - </dd> - <!-- OBJECT PROPERTIES --> - <!-- OBJECT METHODS --> - <!-- OBJECT EVENT FIELDS --> - <!-- FUNCTION PARAMETERS --> - </div> </div> </dl> <!-- RETURNS --> <dl> </dl> <!-- CALLBACK --> - <div> - <div> - <h4>Callback function</h4> - <p> - If you specify the <em>callback</em> parameter, it should - specify a function that looks like this: - </p> - <!-- Note: intentionally longer 80 columns --> - <pre>function(<span></span>) <span class="subdued">{...}</span>;</pre> - <dl> - </dl> - </div> - </div> <!-- MIN_VERSION --> </div> <!-- /description --> </div><div class="apiItem"> |