summaryrefslogtreecommitdiffstats
path: root/chrome/test/data
diff options
context:
space:
mode:
authorHokein.Wu@gmail.com <Hokein.Wu@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-20 15:23:06 +0000
committerHokein.Wu@gmail.com <Hokein.Wu@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-20 15:23:06 +0000
commit2ff009770deb22c291b009a427c392ffbfee2840 (patch)
treee651756ddeab91ec087fefc5306374d5a59526c4 /chrome/test/data
parent1b1d1dfbf22508012ef48ddc406a3e16a848832e (diff)
downloadchromium_src-2ff009770deb22c291b009a427c392ffbfee2840.zip
chromium_src-2ff009770deb22c291b009a427c392ffbfee2840.tar.gz
chromium_src-2ff009770deb22c291b009a427c392ffbfee2840.tar.bz2
[SystemInfo API] Rename systemInfo Display API.
systemInfo.display.getDisplayInfo -> system.display.getInfo systemInfo.display.onDisplayChanged -> system.display.onDisplayChanged systemInfo.display.setDisplayProperties -> system.display.setDisplayProperties BUG=252994 TEST=update system.display API browser_tests and pass through Review URL: https://chromiumcodereview.appspot.com/18925005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212790 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/data')
-rw-r--r--chrome/test/data/extensions/api_test/system/display/manifest.json (renamed from chrome/test/data/extensions/api_test/systeminfo/display/manifest.json)4
-rw-r--r--chrome/test/data/extensions/api_test/system/display/test_display_api.js (renamed from chrome/test/data/extensions/api_test/systeminfo/display/test_display_api.js)8
2 files changed, 6 insertions, 6 deletions
diff --git a/chrome/test/data/extensions/api_test/systeminfo/display/manifest.json b/chrome/test/data/extensions/api_test/system/display/manifest.json
index 542134d6..11792b6 100644
--- a/chrome/test/data/extensions/api_test/systeminfo/display/manifest.json
+++ b/chrome/test/data/extensions/api_test/system/display/manifest.json
@@ -1,8 +1,8 @@
{
"name": "displayinfo",
"version": "1.0",
- "description": "Test systemInfo.display API",
- "permissions": ["systemInfo.display"],
+ "description": "Test system.display API",
+ "permissions": ["system.display"],
"app": {
"background": {
"scripts": ["test_display_api.js"]
diff --git a/chrome/test/data/extensions/api_test/systeminfo/display/test_display_api.js b/chrome/test/data/extensions/api_test/system/display/test_display_api.js
index 7527376..0c7b53b 100644
--- a/chrome/test/data/extensions/api_test/systeminfo/display/test_display_api.js
+++ b/chrome/test/data/extensions/api_test/system/display/test_display_api.js
@@ -1,14 +1,14 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-// systeminfo.memory api test
-// browser_tests --gtest_filter=SystemInfoMemoryApiTest.*
+// system.display api test
+// browser_tests --gtest_filter=SystemDisplayApiTest.*
chrome.test.runTests([
function testGet() {
for(var i = 0; i < 10; ++i) {
- chrome.systemInfo.display.getDisplayInfo(
+ chrome.system.display.getInfo(
chrome.test.callbackPass(function(result) {
chrome.test.assertEq(4, result.length);
for (var i = 0; i < result.length; i++) {