From f86b15aa97d6d4d94d96e3f4b503160ca40dc3e4 Mon Sep 17 00:00:00 2001 From: "levin@chromium.org" Date: Mon, 12 Jul 2010 19:40:50 +0000 Subject: Move idle from experimental. TEST=browser_tests.exe --gtest_filter=ExtensionApiTest.Idle BUG=None Review URL: http://codereview.chromium.org/2930001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52121 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/extensions/extension_idle_api.h | 4 +- .../extensions/extension_idle_api_constants.cc | 2 +- chrome/common/extensions/api/extension_api.json | 9 +- chrome/common/extensions/docs/a11y.html | 1 + chrome/common/extensions/docs/api_index.html | 3 +- chrome/common/extensions/docs/api_other.html | 1 + chrome/common/extensions/docs/autoupdate.html | 1 + .../common/extensions/docs/background_pages.html | 1 + chrome/common/extensions/docs/bookmarks.html | 1 + chrome/common/extensions/docs/browserAction.html | 1 + chrome/common/extensions/docs/content_scripts.html | 1 + chrome/common/extensions/docs/devguide.html | 1 + chrome/common/extensions/docs/docs.html | 1 + chrome/common/extensions/docs/events.html | 1 + .../extensions/docs/experimental.clipboard.html | 1 + .../extensions/docs/experimental.contextMenus.html | 1 + .../extensions/docs/experimental.cookies.html | 1 + chrome/common/extensions/docs/experimental.html | 1 + .../extensions/docs/experimental.infobars.html | 1 + .../extensions/docs/experimental.omnibox.html | 1 + .../extensions/docs/experimental.processes.html | 1 + chrome/common/extensions/docs/extension.html | 1 + .../extensions/docs/external_extensions.html | 1 + chrome/common/extensions/docs/faq.html | 1 + chrome/common/extensions/docs/getstarted.html | 1 + chrome/common/extensions/docs/history.html | 1 + chrome/common/extensions/docs/hosting.html | 1 + chrome/common/extensions/docs/i18n-messages.html | 1 + chrome/common/extensions/docs/i18n.html | 1 + chrome/common/extensions/docs/idle.html | 663 +++++++++++++++++++++ chrome/common/extensions/docs/index.html | 1 + chrome/common/extensions/docs/manifest.html | 1 + chrome/common/extensions/docs/match_patterns.html | 1 + chrome/common/extensions/docs/messaging.html | 1 + chrome/common/extensions/docs/notifications.html | 1 + chrome/common/extensions/docs/npapi.html | 1 + chrome/common/extensions/docs/options.html | 1 + chrome/common/extensions/docs/override.html | 1 + chrome/common/extensions/docs/overview.html | 1 + chrome/common/extensions/docs/packaging.html | 1 + chrome/common/extensions/docs/pageAction.html | 1 + chrome/common/extensions/docs/samples.html | 1 + chrome/common/extensions/docs/tabs.html | 1 + .../extensions/docs/template/api_template.html | 1 + chrome/common/extensions/docs/themes.html | 1 + chrome/common/extensions/docs/tut_analytics.html | 1 + chrome/common/extensions/docs/tut_debugging.html | 1 + chrome/common/extensions/docs/tut_oauth.html | 1 + chrome/common/extensions/docs/tutorials.html | 1 + chrome/common/extensions/docs/windows.html | 1 + chrome/common/extensions/docs/xhr.html | 1 + .../resources/renderer_extension_bindings.js | 2 +- chrome/test/data/extensions/api_test/idle/test.js | 6 +- 53 files changed, 723 insertions(+), 12 deletions(-) create mode 100644 chrome/common/extensions/docs/idle.html diff --git a/chrome/browser/extensions/extension_idle_api.h b/chrome/browser/extensions/extension_idle_api.h index 641628a..ab27ec1 100644 --- a/chrome/browser/extensions/extension_idle_api.h +++ b/chrome/browser/extensions/extension_idle_api.h @@ -18,11 +18,11 @@ class ExtensionIdleEventRouter { DISALLOW_COPY_AND_ASSIGN(ExtensionIdleEventRouter); }; -// Implementation of the chrome.experimental.idle.queryState API. +// Implementation of the chrome.idle.queryState API. class ExtensionIdleQueryStateFunction : public SyncExtensionFunction { public: virtual bool RunImpl(); - DECLARE_EXTENSION_FUNCTION_NAME("experimental.idle.queryState") + DECLARE_EXTENSION_FUNCTION_NAME("idle.queryState") }; #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_IDLE_API_H_ diff --git a/chrome/browser/extensions/extension_idle_api_constants.cc b/chrome/browser/extensions/extension_idle_api_constants.cc index 7cabe37..cf0c8e78 100644 --- a/chrome/browser/extensions/extension_idle_api_constants.cc +++ b/chrome/browser/extensions/extension_idle_api_constants.cc @@ -9,7 +9,7 @@ namespace extension_idle_api_constants { const wchar_t kSecondsKey[] = L"seconds"; const wchar_t kStateKey[] = L"state"; -const char kOnStateChanged[] = "experimental.idle.onStateChanged"; +const char kOnStateChanged[] = "idle.onStateChanged"; const wchar_t kStateActive[] = L"active"; const wchar_t kStateIdle[] = L"idle"; diff --git a/chrome/common/extensions/api/extension_api.json b/chrome/common/extensions/api/extension_api.json index 438162b..1de35a8 100644 --- a/chrome/common/extensions/api/extension_api.json +++ b/chrome/common/extensions/api/extension_api.json @@ -2014,8 +2014,7 @@ ] }, { - "namespace": "experimental.idle", - "nodoc": "true", + "namespace": "idle", "types": [], "functions": [ { @@ -2024,16 +2023,17 @@ "description": "Returns the current state of the browser.", "parameters": [ { - "name": "threshold", + "name": "thresholdSeconds", "type": "integer", "minimum": 15, - "description": "Threshold used to determine when a machine is in the idle state." + "description": "Threshold, in seconds, used to determine when a machine is in the idle state." }, { "name": "callback", "type": "function", "parameters": [ { + "name": "newState", "type": "string", "enum": ["active", "idle", "locked"] } @@ -2049,6 +2049,7 @@ "description": "Fired when the browser changes to an active state. Currently only reports the transition from idle to active.", "parameters": [ { + "name": "newState", "type": "string", "enum": ["active"] } diff --git a/chrome/common/extensions/docs/a11y.html b/chrome/common/extensions/docs/a11y.html index c05575a..17aa5a4 100644 --- a/chrome/common/extensions/docs/a11y.html +++ b/chrome/common/extensions/docs/a11y.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/api_index.html b/chrome/common/extensions/docs/api_index.html index 51893c9..f473e2e 100644 --- a/chrome/common/extensions/docs/api_index.html +++ b/chrome/common/extensions/docs/api_index.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • @@ -293,7 +294,7 @@ Here are the supported chrome.* APIs:

    Experimental APIs

    diff --git a/chrome/common/extensions/docs/api_other.html b/chrome/common/extensions/docs/api_other.html index 8cea60f..1f4b473 100644 --- a/chrome/common/extensions/docs/api_other.html +++ b/chrome/common/extensions/docs/api_other.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/autoupdate.html b/chrome/common/extensions/docs/autoupdate.html index 4e6b2c4..5d8937b 100644 --- a/chrome/common/extensions/docs/autoupdate.html +++ b/chrome/common/extensions/docs/autoupdate.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/background_pages.html b/chrome/common/extensions/docs/background_pages.html index 96da509..f8ebc15 100644 --- a/chrome/common/extensions/docs/background_pages.html +++ b/chrome/common/extensions/docs/background_pages.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/bookmarks.html b/chrome/common/extensions/docs/bookmarks.html index 2641ffa..734a920 100644 --- a/chrome/common/extensions/docs/bookmarks.html +++ b/chrome/common/extensions/docs/bookmarks.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/browserAction.html b/chrome/common/extensions/docs/browserAction.html index 12f96ec..1aa50ad 100644 --- a/chrome/common/extensions/docs/browserAction.html +++ b/chrome/common/extensions/docs/browserAction.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/content_scripts.html b/chrome/common/extensions/docs/content_scripts.html index c869a31..1f47bf0 100644 --- a/chrome/common/extensions/docs/content_scripts.html +++ b/chrome/common/extensions/docs/content_scripts.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/devguide.html b/chrome/common/extensions/docs/devguide.html index 2929e72a3..3c20258 100644 --- a/chrome/common/extensions/docs/devguide.html +++ b/chrome/common/extensions/docs/devguide.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/docs.html b/chrome/common/extensions/docs/docs.html index 51c98bd..3988b49 100644 --- a/chrome/common/extensions/docs/docs.html +++ b/chrome/common/extensions/docs/docs.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/events.html b/chrome/common/extensions/docs/events.html index b0cd2dd..3ab418c 100644 --- a/chrome/common/extensions/docs/events.html +++ b/chrome/common/extensions/docs/events.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/experimental.clipboard.html b/chrome/common/extensions/docs/experimental.clipboard.html index 6990276..6a5650a 100644 --- a/chrome/common/extensions/docs/experimental.clipboard.html +++ b/chrome/common/extensions/docs/experimental.clipboard.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/experimental.contextMenus.html b/chrome/common/extensions/docs/experimental.contextMenus.html index 1a16d4a..be67403 100644 --- a/chrome/common/extensions/docs/experimental.contextMenus.html +++ b/chrome/common/extensions/docs/experimental.contextMenus.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/experimental.cookies.html b/chrome/common/extensions/docs/experimental.cookies.html index b640972..4db8e16 100644 --- a/chrome/common/extensions/docs/experimental.cookies.html +++ b/chrome/common/extensions/docs/experimental.cookies.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/experimental.html b/chrome/common/extensions/docs/experimental.html index 7962b09..e528484 100644 --- a/chrome/common/extensions/docs/experimental.html +++ b/chrome/common/extensions/docs/experimental.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/experimental.infobars.html b/chrome/common/extensions/docs/experimental.infobars.html index 671e2d6..7535e41 100644 --- a/chrome/common/extensions/docs/experimental.infobars.html +++ b/chrome/common/extensions/docs/experimental.infobars.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/experimental.omnibox.html b/chrome/common/extensions/docs/experimental.omnibox.html index 415c38c..8d98a71 100644 --- a/chrome/common/extensions/docs/experimental.omnibox.html +++ b/chrome/common/extensions/docs/experimental.omnibox.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/experimental.processes.html b/chrome/common/extensions/docs/experimental.processes.html index 3c58776..a71707e 100644 --- a/chrome/common/extensions/docs/experimental.processes.html +++ b/chrome/common/extensions/docs/experimental.processes.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/extension.html b/chrome/common/extensions/docs/extension.html index 5186ac3..27df88b 100644 --- a/chrome/common/extensions/docs/extension.html +++ b/chrome/common/extensions/docs/extension.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/external_extensions.html b/chrome/common/extensions/docs/external_extensions.html index 47be989..00354db 100644 --- a/chrome/common/extensions/docs/external_extensions.html +++ b/chrome/common/extensions/docs/external_extensions.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/faq.html b/chrome/common/extensions/docs/faq.html index 733e075..1a8a3e3 100644 --- a/chrome/common/extensions/docs/faq.html +++ b/chrome/common/extensions/docs/faq.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/getstarted.html b/chrome/common/extensions/docs/getstarted.html index a72b1b6..c7a0d4c 100644 --- a/chrome/common/extensions/docs/getstarted.html +++ b/chrome/common/extensions/docs/getstarted.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/history.html b/chrome/common/extensions/docs/history.html index a5cd675157..81688fe 100644 --- a/chrome/common/extensions/docs/history.html +++ b/chrome/common/extensions/docs/history.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/hosting.html b/chrome/common/extensions/docs/hosting.html index bcee424..d96f922 100644 --- a/chrome/common/extensions/docs/hosting.html +++ b/chrome/common/extensions/docs/hosting.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/i18n-messages.html b/chrome/common/extensions/docs/i18n-messages.html index 7615abb..3d35a35 100644 --- a/chrome/common/extensions/docs/i18n-messages.html +++ b/chrome/common/extensions/docs/i18n-messages.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/i18n.html b/chrome/common/extensions/docs/i18n.html index ee1f0d3..7468647 100644 --- a/chrome/common/extensions/docs/i18n.html +++ b/chrome/common/extensions/docs/i18n.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/idle.html b/chrome/common/extensions/docs/idle.html new file mode 100644 index 0000000..353ecb0 --- /dev/null +++ b/chrome/common/extensions/docs/idle.html @@ -0,0 +1,663 @@ + + + + + + + + chrome.idle - Google Chrome Extensions - Google Code
    +
    + You are viewing extension docs in chrome via the 'file:' scheme: are you expecting to see local changes when you refresh? You'll need run chrome with --allow-file-access-from-files. +
    + + +
    + + +
    +
    + paramName + + + +
    + ( + optional + enumerated + + + Type + + + + array of + + paramType + + + + ) +
    + +     +
    +
    + Undocumented. +
    +
    + Description of this parameter from the json schema. +
    +
    + This parameter was added in version + . + You must omit this parameter in earlier versions, + and you may omit it in any version. If you require this + parameter, the manifest key + minimum_chrome_version + can ensure that your extension won't be run in an earlier browser version. +
    + + +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    + + + + + + + + + + + +
    + + +
    +

    Google Chrome Extensions (Labs)

    + +
    + +
    + + + +
    +
    +

    chrome.idle

    +
    + +
    +

    Contents

    +
      +
    1. + h2Name +
        +
      1. + h3Name +
        2. +
      +
      2. +
    2. + API reference: chrome.idle +
        +
      1. + Properties +
          +
        1. + propertyName +
          2. +
        +
        2. +
      2. + Methods +
          +
        1. + queryState +
          2. +
        +
        3. +
      3. + Events +
          +
        1. + onStateChanged +
          2. +
        +
        4. +
      4. + Types +
          +
        1. + id +
          2. +
        +
        5. +
      +
      3. +
    +
    + + + +
    + + +
    + +

    API reference: chrome.idle

    + + + + + +
    + +

    Methods

    + + +
    + +

    queryState

    + +
    void + + chrome.idle.queryState(, integer + thresholdSeconds, function + callback)
    + +
    + +

    Returns the current state of the browser.

    + + +

    Parameters

    +
    +
    +
    +
    + thresholdSeconds + + + +
    + ( + + + + + Type + + + + array of + + integer + + + + ) +
    + +     +
    + +
    Threshold, in seconds, used to determine when a machine is in the idle state.
    +
    + This parameter was added in version + . + You must omit this parameter in earlier versions, + and you may omit it in any version. If you require this + parameter, the manifest key + minimum_chrome_version + can ensure that your extension won't be run in an earlier browser version. +
    + + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + callback + + + +
    + ( + + + + + Type + + + + array of + + function + + + + ) +
    + +     +
    +
    + Undocumented. +
    +
    + Description of this parameter from the json schema. +
    +
    + This parameter was added in version + . + You must omit this parameter in earlier versions, + and you may omit it in any version. If you require this + parameter, the manifest key + minimum_chrome_version + can ensure that your extension won't be run in an earlier browser version. +
    + + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + + +

    Returns

    +
    +
    +
    +
    +
    +
    + + +
    +
    +

    Callback function

    +

    + The callback parameter should specify a function + that looks like this: +

    +

    + If you specify the callback parameter, it should + specify a function that looks like this: +

    + + + 
    function(string newState) {...});
    +
    +
    +
    +
    + newState + + + +
    + ( + + enumerated + + + Type + + + + array of + + string + ["active", "idle", "locked"] + + + ) +
    + +     +
    +
    + Undocumented. +
    +
    + Description of this parameter from the json schema. +
    +
    + This parameter was added in version + . + You must omit this parameter in earlier versions, + and you may omit it in any version. If you require this + parameter, the manifest key + minimum_chrome_version + can ensure that your extension won't be run in an earlier browser version. +
    + + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + + +

    + This function was added in version . + If you require this function, the manifest key + minimum_chrome_version + can ensure that your extension won't be run in an earlier browser version. +

    +
    + +
    + +
    + + +
    + +

    Events

    + + +
    + +

    onStateChanged

    + +
    + + chrome.idle.onStateChanged.addListener(function(string newState) {...}); +
    + +
    + +

    Fired when the browser changes to an active state. Currently only reports the transition from idle to active.

    + + +

    Parameters

    +
    +
    +
    +
    + newState + + + +
    + ( + + enumerated + + + Type + + + + array of + + string + ["active"] + + + ) +
    + +     +
    +
    + Undocumented. +
    +
    + Description of this parameter from the json schema. +
    +
    + This parameter was added in version + . + You must omit this parameter in earlier versions, + and you may omit it in any version. If you require this + parameter, the manifest key + minimum_chrome_version + can ensure that your extension won't be run in an earlier browser version. +
    + + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    + +
    + +
    + + + + +
    +
    +
    +
    + +
    + diff --git a/chrome/common/extensions/docs/index.html b/chrome/common/extensions/docs/index.html index 71470c6..7cf5048 100644 --- a/chrome/common/extensions/docs/index.html +++ b/chrome/common/extensions/docs/index.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/manifest.html b/chrome/common/extensions/docs/manifest.html index a80b969..08eca63 100644 --- a/chrome/common/extensions/docs/manifest.html +++ b/chrome/common/extensions/docs/manifest.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/match_patterns.html b/chrome/common/extensions/docs/match_patterns.html index fa0c6d3..6891bbf 100644 --- a/chrome/common/extensions/docs/match_patterns.html +++ b/chrome/common/extensions/docs/match_patterns.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/messaging.html b/chrome/common/extensions/docs/messaging.html index 3cf458c..b5fed3e 100644 --- a/chrome/common/extensions/docs/messaging.html +++ b/chrome/common/extensions/docs/messaging.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/notifications.html b/chrome/common/extensions/docs/notifications.html index dafafb5..415fab9 100644 --- a/chrome/common/extensions/docs/notifications.html +++ b/chrome/common/extensions/docs/notifications.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/npapi.html b/chrome/common/extensions/docs/npapi.html index 027405f..9956ae8 100644 --- a/chrome/common/extensions/docs/npapi.html +++ b/chrome/common/extensions/docs/npapi.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/options.html b/chrome/common/extensions/docs/options.html index 02c7fc5..cc5b61f 100644 --- a/chrome/common/extensions/docs/options.html +++ b/chrome/common/extensions/docs/options.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/override.html b/chrome/common/extensions/docs/override.html index 43fa884..695db97 100644 --- a/chrome/common/extensions/docs/override.html +++ b/chrome/common/extensions/docs/override.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/overview.html b/chrome/common/extensions/docs/overview.html index 50fa02a..784489a 100644 --- a/chrome/common/extensions/docs/overview.html +++ b/chrome/common/extensions/docs/overview.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/packaging.html b/chrome/common/extensions/docs/packaging.html index 7e8cf49..aa3bcb9 100644 --- a/chrome/common/extensions/docs/packaging.html +++ b/chrome/common/extensions/docs/packaging.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/pageAction.html b/chrome/common/extensions/docs/pageAction.html index 717509a..1649465 100644 --- a/chrome/common/extensions/docs/pageAction.html +++ b/chrome/common/extensions/docs/pageAction.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/samples.html b/chrome/common/extensions/docs/samples.html index 4875bef..41bf32e 100644 --- a/chrome/common/extensions/docs/samples.html +++ b/chrome/common/extensions/docs/samples.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/tabs.html b/chrome/common/extensions/docs/tabs.html index 9d148da..9fa90d8 100644 --- a/chrome/common/extensions/docs/tabs.html +++ b/chrome/common/extensions/docs/tabs.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/template/api_template.html b/chrome/common/extensions/docs/template/api_template.html index 90cda98..9b09aaa 100644 --- a/chrome/common/extensions/docs/template/api_template.html +++ b/chrome/common/extensions/docs/template/api_template.html @@ -155,6 +155,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/themes.html b/chrome/common/extensions/docs/themes.html index d13bcaf..bb55246 100644 --- a/chrome/common/extensions/docs/themes.html +++ b/chrome/common/extensions/docs/themes.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/tut_analytics.html b/chrome/common/extensions/docs/tut_analytics.html index ac215f2..2723b17 100644 --- a/chrome/common/extensions/docs/tut_analytics.html +++ b/chrome/common/extensions/docs/tut_analytics.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/tut_debugging.html b/chrome/common/extensions/docs/tut_debugging.html index 56d3b56..c1bb620 100644 --- a/chrome/common/extensions/docs/tut_debugging.html +++ b/chrome/common/extensions/docs/tut_debugging.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/tut_oauth.html b/chrome/common/extensions/docs/tut_oauth.html index bff4481..e608677 100644 --- a/chrome/common/extensions/docs/tut_oauth.html +++ b/chrome/common/extensions/docs/tut_oauth.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/tutorials.html b/chrome/common/extensions/docs/tutorials.html index de7a366..e05091a 100644 --- a/chrome/common/extensions/docs/tutorials.html +++ b/chrome/common/extensions/docs/tutorials.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/windows.html b/chrome/common/extensions/docs/windows.html index b1d7f76..7fed1aa 100644 --- a/chrome/common/extensions/docs/windows.html +++ b/chrome/common/extensions/docs/windows.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/common/extensions/docs/xhr.html b/chrome/common/extensions/docs/xhr.html index 4353955..32a58ba 100644 --- a/chrome/common/extensions/docs/xhr.html +++ b/chrome/common/extensions/docs/xhr.html @@ -168,6 +168,7 @@
  • Background Pages
  • Content Scripts
  • Cross-Origin XHR
    • +
  • Idle
  • Internationalization
  • Message Passing
  • NPAPI Plugins
    • diff --git a/chrome/renderer/resources/renderer_extension_bindings.js b/chrome/renderer/resources/renderer_extension_bindings.js index e2e0e1d..b4246c7 100644 --- a/chrome/renderer/resources/renderer_extension_bindings.js +++ b/chrome/renderer/resources/renderer_extension_bindings.js @@ -250,7 +250,6 @@ var chrome = chrome || {}; "experimental.contextMenus", "experimental.cookies", "experimental.extension", - "experimental.idle", "experimental.infobars", "experimental.metrics", "experimental.omnibox", @@ -258,6 +257,7 @@ var chrome = chrome || {}; "experimental.processes", "experimental.rlz", "history", + "idle", "pageAction", "pageActions", "tabs", diff --git a/chrome/test/data/extensions/api_test/idle/test.js b/chrome/test/data/extensions/api_test/idle/test.js index 68dcded..9e9128d 100644 --- a/chrome/test/data/extensions/api_test/idle/test.js +++ b/chrome/test/data/extensions/api_test/idle/test.js @@ -17,9 +17,9 @@ chrome.test.runTests([ // Exercise querying the state. Querying the state multiple times within // the same threshold exercises different code. function queryState() { - chrome.experimental.idle.queryState(60, pass(function(state) { + chrome.idle.queryState(60, pass(function(state) { var previous_state = state; - chrome.experimental.idle.queryState(120, pass(function(state) { + chrome.idle.queryState(120, pass(function(state) { assertEq(previous_state, state); chrome.test.succeed(); })); @@ -28,7 +28,7 @@ chrome.test.runTests([ // Exercise the setting of the event listener. function setCallback() { - chrome.experimental.idle.onStateChanged.addListener(function(state) { + chrome.idle.onStateChanged.addListener(function(state) { window.console.log('current state: ' + state); // The test has succeeded. -- cgit v1.1