diff options
| author | tengs <tengs@chromium.org> | 2015-05-28 10:58:45 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-28 18:00:23 +0000 |
| commit | 92e1a5d3e91e68e3df9a225d56c8b5f12ea81bfc (patch) | |
| tree | f47f323bda81e647d5148c0f3afb1ffb2c596ae1 /tools | |
| parent | ad743e77aba6ba10f758e84cde4920fbd14197cd (diff) | |
| download | chromium_src-92e1a5d3e91e68e3df9a225d56c8b5f12ea81bfc.zip chromium_src-92e1a5d3e91e68e3df9a225d56c8b5f12ea81bfc.tar.gz chromium_src-92e1a5d3e91e68e3df9a225d56c8b5f12ea81bfc.tar.bz2 | |
Hook up findEligibleUnlockDevices CryptAuth API to chrome://proximity-auth.
Clicking the "Eligible Devices" tab will perform the API call and display the devices returned by CryptAuth on the page.
This change also introduces a delegate interface for the WebUI to fetch objects with dependencies on chrome.
BUG=409158
Review URL: https://codereview.chromium.org/1145113004
Cr-Commit-Position: refs/heads/master@{#331819}
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/gritsettings/resource_ids | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids index 6562e14..b4670cf 100644 --- a/tools/gritsettings/resource_ids +++ b/tools/gritsettings/resource_ids @@ -246,7 +246,7 @@ "includes": [30250], }, "components/resources/components_scaled_resources.grd": { - "structures": [30280], + "structures": [30300], }, "third_party/WebKit/public/blink_resources.grd": { "includes": [30350], |