summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorasargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-20 20:14:50 +0000
committerasargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-20 20:14:50 +0000
commitf0233ffea6d5be7a10fe4ffaa4a9d037e4f718d8 (patch)
tree4eb47227593dcf06a1ab8445cc3c2ea30ca49303 /chrome/common
parent7226735bad88a543ede72db621bb1fe618fc20b6 (diff)
downloadchromium_src-f0233ffea6d5be7a10fe4ffaa4a9d037e4f718d8.zip
chromium_src-f0233ffea6d5be7a10fe4ffaa4a9d037e4f718d8.tar.gz
chromium_src-f0233ffea6d5be7a10fe4ffaa4a9d037e4f718d8.tar.bz2
Move chrome.appWindow to chrome.app.window.
BUG=134573 TEST=In platform apps, you should be able to call all the same methods, etc. via the new chrome.app.window namespace that you used to be able to with chrome.appWindow. Review URL: https://chromiumcodereview.appspot.com/10659021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147710 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/extensions/api/_permission_features.json2
-rw-r--r--chrome/common/extensions/api/app_window.idl5
-rw-r--r--chrome/common/extensions/docs/apps/api_index.html2
-rw-r--r--chrome/common/extensions/docs/apps/app.window.html (renamed from chrome/common/extensions/docs/apps/appWindow.html)36
-rw-r--r--chrome/common/extensions/docs/apps/app_external.html6
-rw-r--r--chrome/common/extensions/docs/apps/app_hardware.html2
-rw-r--r--chrome/common/extensions/docs/apps/app_lifecycle.html4
-rw-r--r--chrome/common/extensions/docs/apps/first_app.html4
-rw-r--r--chrome/common/extensions/docs/extensions/appWindow.html723
-rw-r--r--chrome/common/extensions/docs/extensions/samples.html2
-rw-r--r--chrome/common/extensions/docs/samples.json14
-rw-r--r--chrome/common/extensions/docs/static/app.window.html0
-rw-r--r--chrome/common/extensions/docs/static/app_external.html6
-rw-r--r--chrome/common/extensions/docs/static/app_hardware.html2
-rw-r--r--chrome/common/extensions/docs/static/app_lifecycle.html4
-rw-r--r--chrome/common/extensions/docs/static/first_app.html4
-rw-r--r--chrome/common/extensions/extension.cc2
-rw-r--r--chrome/common/extensions/permissions/api_permission.cc2
18 files changed, 52 insertions, 768 deletions
diff --git a/chrome/common/extensions/api/_permission_features.json b/chrome/common/extensions/api/_permission_features.json
index d4df7c4..c9dfbd7 100644
--- a/chrome/common/extensions/api/_permission_features.json
+++ b/chrome/common/extensions/api/_permission_features.json
@@ -13,7 +13,7 @@
"extension_types": ["extension", "packaged_app", "platform_app"],
"min_manifest_version": 2
},
- "appWindow": {
+ "app.window": {
"channel": "dev",
"extension_types": ["platform_app"]
},
diff --git a/chrome/common/extensions/api/app_window.idl b/chrome/common/extensions/api/app_window.idl
index 57bfb81..7c61e06 100644
--- a/chrome/common/extensions/api/app_window.idl
+++ b/chrome/common/extensions/api/app_window.idl
@@ -4,7 +4,7 @@
// File-level comment to appease parser. Eventually this will not be necessary.
-namespace appWindow {
+namespace app.window {
dictionary CreateWindowOptions {
// Width of the window.
long? width;
@@ -37,7 +37,8 @@ namespace appWindow {
DOMString? frame;
};
- callback CreateWindowCallback = void (long view_id);
+ callback CreateWindowCallback =
+ void ([instanceOf=global] object created_window);
interface Functions {
static void create(DOMString url,
diff --git a/chrome/common/extensions/docs/apps/api_index.html b/chrome/common/extensions/docs/apps/api_index.html
index b03038c..5ac85e0 100644
--- a/chrome/common/extensions/docs/apps/api_index.html
+++ b/chrome/common/extensions/docs/apps/api_index.html
@@ -199,7 +199,7 @@ Here are the supported chrome.* APIs:
</p>
<ul>
<li><a href="alarms.html" js="">alarms</a>
- </li><li><a href="appWindow.html" js="">appWindow</a>
+ </li><li><a href="app.window.html" js="">app.window</a>
</li><li><a href="contextMenus.html" js="">contextMenus</a>
</li><li><a href="events.html" js="">events</a>
</li><li><a href="fileSystem.html" js="">fileSystem</a>
diff --git a/chrome/common/extensions/docs/apps/appWindow.html b/chrome/common/extensions/docs/apps/app.window.html
index 2957411..7851821 100644
--- a/chrome/common/extensions/docs/apps/appWindow.html
+++ b/chrome/common/extensions/docs/apps/app.window.html
@@ -17,7 +17,7 @@
<script type="text/javascript" src="../js/api_page_generator.js"></script>
<script type="text/javascript" src="../js/bootstrap.js"></script>
<script type="text/javascript" src="../js/sidebar.js"></script>
- <meta name="description" content="Documentation for the chrome.appWindow module, which is part of the Google Chrome extension APIs."><title>chrome.appWindow - Google Chrome Extensions - Google Code</title></head>
+ <meta name="description" content="Documentation for the chrome.app.window module, which is part of the Google Chrome extension APIs."><title>chrome.app.window - Google Chrome Extensions - Google Code</title></head>
<body doc-family="apps"> <link href="../css/ApiRefStyles_apps.css" rel="stylesheet" type="text/css">
<link href="../css/prettify.css" rel="stylesheet" type="text/css">
<link href="../css/shared.css" rel="stylesheet" type="text/css">
@@ -157,14 +157,14 @@
</script>
<div class="g-unit" id="gc-pagecontent">
<div id="pageTitle">
- <h1 class="page_title">chrome.appWindow</h1>
+ <h1 class="page_title">chrome.app.window</h1>
</div>
<!-- TABLE OF CONTENTS -->
<div id="toc">
<h2>Contents</h2>
<ol>
<li>
- <a href="#apiReference">API reference: chrome.appWindow</a>
+ <a href="#apiReference">API reference: chrome.app.window</a>
<ol>
<li>
<a href="#global-methods">Methods</a>
@@ -190,7 +190,7 @@
<a href="#types">Types</a>
<ol>
<li>
- <a href="#type-appWindow.CreateWindowOptions">appWindow.CreateWindowOptions</a>
+ <a href="#type-app.window.CreateWindowOptions">app.window.CreateWindowOptions</a>
<ol>
</ol>
</li>
@@ -218,7 +218,7 @@
<!-- API PAGE -->
<div class="apiPage">
<a name="apiReference"></a>
- <h2>API reference: chrome.appWindow</h2>
+ <h2>API reference: chrome.app.window</h2>
<!-- PROPERTIES -->
<!-- /apiGroup -->
<!-- METHODS -->
@@ -231,8 +231,8 @@
<h4>create</h4>
<div class="summary">
<!-- Note: intentionally longer 80 columns -->
- <span>chrome.appWindow.create</span>(<span class="null"><span>string</span>
- <var><span>url</span></var></span><span class="optional"><span>, </span><span>appWindow.CreateWindowOptions</span>
+ <span>chrome.app.window.create</span>(<span class="null"><span>string</span>
+ <var><span>url</span></var></span><span class="optional"><span>, </span><span>app.window.CreateWindowOptions</span>
<var><span>options</span></var></span><span class="optional"><span>, </span><span>function</span>
<var><span>CreateWindowCallback</span></var></span>)</div>
<div class="description">
@@ -275,7 +275,7 @@
<span class="optional">optional</span>
<span id="typeTemplate">
<span>
- <a href="appWindow.html#type-appWindow.CreateWindowOptions">appWindow.CreateWindowOptions</a>
+ <a href="app.window.html#type-app.window.CreateWindowOptions">app.window.CreateWindowOptions</a>
</span>
</span>
)
@@ -322,14 +322,14 @@
<div>
<div>
<dt>
- <var>view_id</var>
+ <var>created_window</var>
<em>
<!-- TYPE -->
<div style="display:inline">
(
<span id="typeTemplate">
<span>
- <span>integer</span>
+ <span>global</span>
</span>
</span>
)
@@ -362,7 +362,7 @@
<h4>focus</h4>
<div class="summary">
<!-- Note: intentionally longer 80 columns -->
- <span>chrome.appWindow.focus</span>()</div>
+ <span>chrome.app.window.focus</span>()</div>
<div class="description">
<!-- PARAMETERS -->
<dl>
@@ -378,7 +378,7 @@
<h4>maximize</h4>
<div class="summary">
<!-- Note: intentionally longer 80 columns -->
- <span>chrome.appWindow.maximize</span>()</div>
+ <span>chrome.app.window.maximize</span>()</div>
<div class="description">
<!-- PARAMETERS -->
<dl>
@@ -394,7 +394,7 @@
<h4>minimize</h4>
<div class="summary">
<!-- Note: intentionally longer 80 columns -->
- <span>chrome.appWindow.minimize</span>()</div>
+ <span>chrome.app.window.minimize</span>()</div>
<div class="description">
<!-- PARAMETERS -->
<dl>
@@ -410,7 +410,7 @@
<h4>moveTo</h4>
<div class="summary">
<!-- Note: intentionally longer 80 columns -->
- <span>chrome.appWindow.moveTo</span>(<span class="null"><span>integer</span>
+ <span>chrome.app.window.moveTo</span>(<span class="null"><span>integer</span>
<var><span>x</span></var></span><span class="null"><span>, </span><span>integer</span>
<var><span>y</span></var></span>)</div>
<div class="description">
@@ -480,7 +480,7 @@
<h4>resizeTo</h4>
<div class="summary">
<!-- Note: intentionally longer 80 columns -->
- <span>chrome.appWindow.resizeTo</span>(<span class="null"><span>integer</span>
+ <span>chrome.app.window.resizeTo</span>(<span class="null"><span>integer</span>
<var><span>width</span></var></span><span class="null"><span>, </span><span>integer</span>
<var><span>height</span></var></span>)</div>
<div class="description">
@@ -550,7 +550,7 @@
<h4>restore</h4>
<div class="summary">
<!-- Note: intentionally longer 80 columns -->
- <span>chrome.appWindow.restore</span>()</div>
+ <span>chrome.app.window.restore</span>()</div>
<div class="description">
<!-- PARAMETERS -->
<dl>
@@ -571,8 +571,8 @@
<h3 id="types">Types</h3>
<!-- iterates over all types -->
<div class="apiItem">
- <a name="type-appWindow.CreateWindowOptions"></a>
- <h4>appWindow.CreateWindowOptions</h4>
+ <a name="type-app.window.CreateWindowOptions"></a>
+ <h4>app.window.CreateWindowOptions</h4>
<div>
<dt>
<em>
diff --git a/chrome/common/extensions/docs/apps/app_external.html b/chrome/common/extensions/docs/apps/app_external.html
index 9dbb60d..a1680fb 100644
--- a/chrome/common/extensions/docs/apps/app_external.html
+++ b/chrome/common/extensions/docs/apps/app_external.html
@@ -352,13 +352,13 @@ one for the main app window that isn't sandboxed,
and one for the sandboxed page:
</p>
<pre>chrome.experimental.app.onLaunched.addListener(function() {
- chrome.appWindow.create('window.html', {
+ chrome.app.window.create('window.html', {
'width': 400,
'height': 400,
'left': 0,
'top': 0
});
- chrome.appWindow.create('sandboxed.html', {
+ chrome.app.window.create('sandboxed.html', {
'width': 400,
'height': 400,
'left': 400,
@@ -395,7 +395,7 @@ opens:
</p>
<pre>var myWin = null;
chrome.experimental.app.onLaunched.addListener(function() {
- chrome.appWindow.create('sandboxed.html', {
+ chrome.app.window.create('sandboxed.html', {
'width': 400,
'height': 400
}, function(win) {
diff --git a/chrome/common/extensions/docs/apps/app_hardware.html b/chrome/common/extensions/docs/apps/app_hardware.html
index 16767af..d257c85 100644
--- a/chrome/common/extensions/docs/apps/app_hardware.html
+++ b/chrome/common/extensions/docs/apps/app_hardware.html
@@ -241,7 +241,7 @@ You must add the "usb" permission
to the manifest file:
</p>
<pre>"permissions": [
- "appWindow",
+ "app.window",
"experimental",
"usb"
]
diff --git a/chrome/common/extensions/docs/apps/app_lifecycle.html b/chrome/common/extensions/docs/apps/app_lifecycle.html
index 3be6bb3..0fc40f6 100644
--- a/chrome/common/extensions/docs/apps/app_lifecycle.html
+++ b/chrome/common/extensions/docs/apps/app_lifecycle.html
@@ -275,7 +275,7 @@ for example, a chat panel.
<p>Here's a sample <code>background.js</code>
with a 'shell' window:</p>
<pre>chrome.experimental.app.onLaunched.addListener(function() {
- chrome.appWindow.create('main.html', {
+ chrome.app.window.create('main.html', {
width: 800,
height: 600,
minWidth: 800,
@@ -290,7 +290,7 @@ for example, a chat panel.
with a 'panel' window:
</p>
<pre>chrome.experimental.app.onLaunched.addListener(function() {
- chrome.appWindow.create('index.html', {
+ chrome.app.window.create('index.html', {
width: 400,
height: 200,
type: 'panel'
diff --git a/chrome/common/extensions/docs/apps/first_app.html b/chrome/common/extensions/docs/apps/first_app.html
index 8e4314a..ddcb701 100644
--- a/chrome/common/extensions/docs/apps/first_app.html
+++ b/chrome/common/extensions/docs/apps/first_app.html
@@ -243,7 +243,7 @@ describes this manifest in detail):
"scripts": ["background.js"]
}
},
- "permissions": ["experimental", "appWindow"],
+ "permissions": ["experimental", "app.window"],
"icons": { "16": "calculator-16.png", "128": "calculator-128.png" }
}
</pre>
@@ -258,7 +258,7 @@ Next create a new file called <code>background.js</code>
with the following content:
</p>
<pre>chrome.experimental.app.onLaunched.addListener(function() {
- chrome.appWindow.create('window.html', {
+ chrome.app.window.create('window.html', {
'width': 400,
'height': 500
});
diff --git a/chrome/common/extensions/docs/extensions/appWindow.html b/chrome/common/extensions/docs/extensions/appWindow.html
index bc9a6ec..3784bf5 100644
--- a/chrome/common/extensions/docs/extensions/appWindow.html
+++ b/chrome/common/extensions/docs/extensions/appWindow.html
@@ -17,7 +17,7 @@
<script type="text/javascript" src="../js/api_page_generator.js"></script>
<script type="text/javascript" src="../js/bootstrap.js"></script>
<script type="text/javascript" src="../js/sidebar.js"></script>
- <meta name="description" content="Documentation for the chrome.appWindow module, which is part of the Google Chrome extension APIs."><title>chrome.appWindow - Google Chrome Extensions - Google Code</title></head>
+ <title>App Window - Google Chrome Extensions - Google Code</title></head>
<body doc-family="extensions"> <link href="../css/ApiRefStyles.css" rel="stylesheet" type="text/css">
<link href="../css/shared.css" rel="stylesheet" type="text/css">
<div id="devModeWarning" class="displayModeWarning">
@@ -186,732 +186,15 @@
</script>
<div class="g-unit" id="gc-pagecontent">
<div id="pageTitle">
- <h1 class="page_title">chrome.appWindow</h1>
+ <h1 class="page_title">App Window</h1>
</div>
<!-- TABLE OF CONTENTS -->
- <div id="toc">
- <h2>Contents</h2>
- <ol>
- <li>
- <a href="#apiReference">API reference: chrome.appWindow</a>
- <ol>
- <li>
- <a href="#global-methods">Methods</a>
- <ol>
- <li>
- <a href="#method-create">create</a>
- </li><li>
- <a href="#method-focus">focus</a>
- </li><li>
- <a href="#method-maximize">maximize</a>
- </li><li>
- <a href="#method-minimize">minimize</a>
- </li><li>
- <a href="#method-moveTo">moveTo</a>
- </li><li>
- <a href="#method-resizeTo">resizeTo</a>
- </li><li>
- <a href="#method-restore">restore</a>
- </li>
- </ol>
- </li>
- <li>
- <a href="#types">Types</a>
- <ol>
- <li>
- <a href="#type-appWindow.CreateWindowOptions">CreateWindowOptions</a>
- <ol>
- </ol>
- </li>
- </ol>
- </li>
- </ol>
- </li>
- </ol>
- </div>
<!-- /TABLE OF CONTENTS -->
<!-- Standard content lead-in for experimental API pages -->
- <p class="warning">
- <!-- Standard content lead-in for APIs that are not yet available on
- the stable channel. -->
- <em>Warning:</em> This API is still under development. It is only
- available for Chrome users on the
- <span>
- <strong>dev</strong>
- <a href="http://www.chromium.org/getting-involved/dev-channel">early
- release channel</a>.</span>
- <a href="TODO">Learn more</a>.
- </p>
<!-- STATIC CONTENT PLACEHOLDER -->
<div id="static"></div>
<!-- API PAGE -->
- <div class="apiPage">
- <a name="apiReference"></a>
- <h2>API reference: chrome.appWindow</h2>
- <!-- PROPERTIES -->
- <!-- /apiGroup -->
- <!-- METHODS -->
- <div id="methodsTemplate" class="apiGroup">
- <a name="global-methods"></a>
- <h3>Methods</h3>
- <!-- iterates over all functions -->
- <div class="apiItem">
- <a name="method-create"></a> <!-- method-anchor -->
- <h4>create</h4>
- <div class="summary">
- <!-- Note: intentionally longer 80 columns -->
- <span>chrome.appWindow.create</span>(<span class="null"><span>string</span>
- <var><span>url</span></var></span><span class="optional"><span>, </span><span>appWindow.CreateWindowOptions</span>
- <var><span>options</span></var></span><span class="optional"><span>, </span><span>function</span>
- <var><span>CreateWindowCallback</span></var></span>)</div>
- <div class="description">
- <!-- PARAMETERS -->
- <h4>Parameters</h4>
- <dl>
- <div>
- <div>
- <dt>
- <var>url</var>
- <em>
- <!-- TYPE -->
- <div style="display:inline">
- (
- <span id="typeTemplate">
- <span>
- <span>string</span>
- </span>
- </span>
- )
- </div>
- </em>
- </dt>
- <dd class="todo">
- Undocumented.
- </dd>
- <!-- OBJECT PROPERTIES -->
- <!-- OBJECT METHODS -->
- <!-- OBJECT EVENT FIELDS -->
- <!-- FUNCTION PARAMETERS -->
- </div>
- </div><div>
- <div>
- <dt>
- <var>options</var>
- <em>
- <!-- TYPE -->
- <div style="display:inline">
- (
- <span class="optional">optional</span>
- <span id="typeTemplate">
- <span>
- <a href="appWindow.html#type-appWindow.CreateWindowOptions">appWindow.CreateWindowOptions</a>
- </span>
- </span>
- )
- </div>
- </em>
- </dt>
- <dd class="todo">
- Undocumented.
- </dd>
- <!-- OBJECT PROPERTIES -->
- <!-- OBJECT METHODS -->
- <!-- OBJECT EVENT FIELDS -->
- <!-- FUNCTION PARAMETERS -->
- </div>
- </div><div>
- <div>
- <dt>
- <var>CreateWindowCallback</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 -->
- <dd>
- <div>
- <h5>Parameters</h5>
- <dl>
- <div>
- <div>
- <dt>
- <var>view_id</var>
- <em>
- <!-- TYPE -->
- <div style="display:inline">
- (
- <span id="typeTemplate">
- <span>
- <span>integer</span>
- </span>
- </span>
- )
- </div>
- </em>
- </dt>
- <dd class="todo">
- Undocumented.
- </dd>
- <!-- OBJECT PROPERTIES -->
- <!-- OBJECT METHODS -->
- <!-- OBJECT EVENT FIELDS -->
- <!-- FUNCTION PARAMETERS -->
- </div>
- </div>
- </dl>
- </div>
- </dd>
- </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>integer view_id</span>) <span class="subdued">{...}</span>;</pre>
- <dl>
- <div>
- <div>
- <dt>
- <var>view_id</var>
- <em>
- <!-- TYPE -->
- <div style="display:inline">
- (
- <span id="typeTemplate">
- <span>
- <span>integer</span>
- </span>
- </span>
- )
- </div>
- </em>
- </dt>
- <dd class="todo">
- Undocumented.
- </dd>
- <!-- OBJECT PROPERTIES -->
- <!-- OBJECT METHODS -->
- <!-- OBJECT EVENT FIELDS -->
- <!-- FUNCTION PARAMETERS -->
- </div>
- </div>
- </dl>
- </div>
- </div>
- <!-- MIN_VERSION -->
- </div> <!-- /description -->
- </div><div class="apiItem">
- <a name="method-focus"></a> <!-- method-anchor -->
- <h4>focus</h4>
- <div class="summary">
- <!-- Note: intentionally longer 80 columns -->
- <span>chrome.appWindow.focus</span>()</div>
- <div class="description">
- <!-- PARAMETERS -->
- <dl>
- </dl>
- <!-- RETURNS -->
- <dl>
- </dl>
- <!-- CALLBACK -->
- <!-- MIN_VERSION -->
- </div> <!-- /description -->
- </div><div class="apiItem">
- <a name="method-maximize"></a> <!-- method-anchor -->
- <h4>maximize</h4>
- <div class="summary">
- <!-- Note: intentionally longer 80 columns -->
- <span>chrome.appWindow.maximize</span>()</div>
- <div class="description">
- <!-- PARAMETERS -->
- <dl>
- </dl>
- <!-- RETURNS -->
- <dl>
- </dl>
- <!-- CALLBACK -->
- <!-- MIN_VERSION -->
- </div> <!-- /description -->
- </div><div class="apiItem">
- <a name="method-minimize"></a> <!-- method-anchor -->
- <h4>minimize</h4>
- <div class="summary">
- <!-- Note: intentionally longer 80 columns -->
- <span>chrome.appWindow.minimize</span>()</div>
- <div class="description">
- <!-- PARAMETERS -->
- <dl>
- </dl>
- <!-- RETURNS -->
- <dl>
- </dl>
- <!-- CALLBACK -->
- <!-- MIN_VERSION -->
- </div> <!-- /description -->
- </div><div class="apiItem">
- <a name="method-moveTo"></a> <!-- method-anchor -->
- <h4>moveTo</h4>
- <div class="summary">
- <!-- Note: intentionally longer 80 columns -->
- <span>chrome.appWindow.moveTo</span>(<span class="null"><span>integer</span>
- <var><span>x</span></var></span><span class="null"><span>, </span><span>integer</span>
- <var><span>y</span></var></span>)</div>
- <div class="description">
- <!-- PARAMETERS -->
- <h4>Parameters</h4>
- <dl>
- <div>
- <div>
- <dt>
- <var>x</var>
- <em>
- <!-- TYPE -->
- <div style="display:inline">
- (
- <span id="typeTemplate">
- <span>
- <span>integer</span>
- </span>
- </span>
- )
- </div>
- </em>
- </dt>
- <dd class="todo">
- Undocumented.
- </dd>
- <!-- OBJECT PROPERTIES -->
- <!-- OBJECT METHODS -->
- <!-- OBJECT EVENT FIELDS -->
- <!-- FUNCTION PARAMETERS -->
- </div>
- </div><div>
- <div>
- <dt>
- <var>y</var>
- <em>
- <!-- TYPE -->
- <div style="display:inline">
- (
- <span id="typeTemplate">
- <span>
- <span>integer</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 -->
- <!-- MIN_VERSION -->
- </div> <!-- /description -->
- </div><div class="apiItem">
- <a name="method-resizeTo"></a> <!-- method-anchor -->
- <h4>resizeTo</h4>
- <div class="summary">
- <!-- Note: intentionally longer 80 columns -->
- <span>chrome.appWindow.resizeTo</span>(<span class="null"><span>integer</span>
- <var><span>width</span></var></span><span class="null"><span>, </span><span>integer</span>
- <var><span>height</span></var></span>)</div>
- <div class="description">
- <!-- PARAMETERS -->
- <h4>Parameters</h4>
- <dl>
- <div>
- <div>
- <dt>
- <var>width</var>
- <em>
- <!-- TYPE -->
- <div style="display:inline">
- (
- <span id="typeTemplate">
- <span>
- <span>integer</span>
- </span>
- </span>
- )
- </div>
- </em>
- </dt>
- <dd class="todo">
- Undocumented.
- </dd>
- <!-- OBJECT PROPERTIES -->
- <!-- OBJECT METHODS -->
- <!-- OBJECT EVENT FIELDS -->
- <!-- FUNCTION PARAMETERS -->
- </div>
- </div><div>
- <div>
- <dt>
- <var>height</var>
- <em>
- <!-- TYPE -->
- <div style="display:inline">
- (
- <span id="typeTemplate">
- <span>
- <span>integer</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 -->
- <!-- MIN_VERSION -->
- </div> <!-- /description -->
- </div><div class="apiItem">
- <a name="method-restore"></a> <!-- method-anchor -->
- <h4>restore</h4>
- <div class="summary">
- <!-- Note: intentionally longer 80 columns -->
- <span>chrome.appWindow.restore</span>()</div>
- <div class="description">
- <!-- PARAMETERS -->
- <dl>
- </dl>
- <!-- RETURNS -->
- <dl>
- </dl>
- <!-- CALLBACK -->
- <!-- MIN_VERSION -->
- </div> <!-- /description -->
- </div> <!-- /apiItem -->
- </div> <!-- /apiGroup -->
- <!-- EVENTS -->
- <!-- /apiGroup -->
- <!-- TYPES -->
- <div class="apiGroup">
- <a name="types"></a>
- <h3 id="types">Types</h3>
- <!-- iterates over all types -->
- <div class="apiItem">
- <a name="type-appWindow.CreateWindowOptions"></a>
- <h4>appWindow.CreateWindowOptions</h4>
- <div>
- <dt>
- <em>
- <!-- TYPE -->
- <div style="display:inline">
- (
- <span id="typeTemplate">
- <span>
- <span>object</span>
- </span>
- </span>
- )
- </div>
- </em>
- </dt>
- <dd class="todo">
- Undocumented.
- </dd>
- <!-- OBJECT PROPERTIES -->
- <dd>
- <dl>
- <div>
- <div>
- <dt>
- <var>frame</var>
- <em>
- <!-- TYPE -->
- <div style="display:inline">
- (
- <span class="optional">optional</span>
- <span id="typeTemplate">
- <span>
- <span>string</span>
- </span>
- </span>
- )
- </div>
- </em>
- </dt>
- <dd>Frame type: 'none' or 'chrome' (defaults to 'chrome').</dd>
- <!-- OBJECT PROPERTIES -->
- <!-- OBJECT METHODS -->
- <!-- OBJECT EVENT FIELDS -->
- <!-- FUNCTION PARAMETERS -->
- </div>
- </div><div>
- <div>
- <dt>
- <var>height</var>
- <em>
- <!-- TYPE -->
- <div style="display:inline">
- (
- <span class="optional">optional</span>
- <span id="typeTemplate">
- <span>
- <span>integer</span>
- </span>
- </span>
- )
- </div>
- </em>
- </dt>
- <dd>Height of the window.</dd>
- <!-- OBJECT PROPERTIES -->
- <!-- OBJECT METHODS -->
- <!-- OBJECT EVENT FIELDS -->
- <!-- FUNCTION PARAMETERS -->
- </div>
- </div><div>
- <div>
- <dt>
- <var>left</var>
- <em>
- <!-- TYPE -->
- <div style="display:inline">
- (
- <span class="optional">optional</span>
- <span id="typeTemplate">
- <span>
- <span>integer</span>
- </span>
- </span>
- )
- </div>
- </em>
- </dt>
- <dd>X coordinate of the window.</dd>
- <!-- OBJECT PROPERTIES -->
- <!-- OBJECT METHODS -->
- <!-- OBJECT EVENT FIELDS -->
- <!-- FUNCTION PARAMETERS -->
- </div>
- </div><div>
- <div>
- <dt>
- <var>maxHeight</var>
- <em>
- <!-- TYPE -->
- <div style="display:inline">
- (
- <span class="optional">optional</span>
- <span id="typeTemplate">
- <span>
- <span>integer</span>
- </span>
- </span>
- )
- </div>
- </em>
- </dt>
- <dd>Maximum height of the window.</dd>
- <!-- OBJECT PROPERTIES -->
- <!-- OBJECT METHODS -->
- <!-- OBJECT EVENT FIELDS -->
- <!-- FUNCTION PARAMETERS -->
- </div>
- </div><div>
- <div>
- <dt>
- <var>maxWidth</var>
- <em>
- <!-- TYPE -->
- <div style="display:inline">
- (
- <span class="optional">optional</span>
- <span id="typeTemplate">
- <span>
- <span>integer</span>
- </span>
- </span>
- )
- </div>
- </em>
- </dt>
- <dd>Maximum width of the window.</dd>
- <!-- OBJECT PROPERTIES -->
- <!-- OBJECT METHODS -->
- <!-- OBJECT EVENT FIELDS -->
- <!-- FUNCTION PARAMETERS -->
- </div>
- </div><div>
- <div>
- <dt>
- <var>minHeight</var>
- <em>
- <!-- TYPE -->
- <div style="display:inline">
- (
- <span class="optional">optional</span>
- <span id="typeTemplate">
- <span>
- <span>integer</span>
- </span>
- </span>
- )
- </div>
- </em>
- </dt>
- <dd>Minimum height of the window.</dd>
- <!-- OBJECT PROPERTIES -->
- <!-- OBJECT METHODS -->
- <!-- OBJECT EVENT FIELDS -->
- <!-- FUNCTION PARAMETERS -->
- </div>
- </div><div>
- <div>
- <dt>
- <var>minWidth</var>
- <em>
- <!-- TYPE -->
- <div style="display:inline">
- (
- <span class="optional">optional</span>
- <span id="typeTemplate">
- <span>
- <span>integer</span>
- </span>
- </span>
- )
- </div>
- </em>
- </dt>
- <dd>Minimium width of the window.</dd>
- <!-- OBJECT PROPERTIES -->
- <!-- OBJECT METHODS -->
- <!-- OBJECT EVENT FIELDS -->
- <!-- FUNCTION PARAMETERS -->
- </div>
- </div><div>
- <div>
- <dt>
- <var>top</var>
- <em>
- <!-- TYPE -->
- <div style="display:inline">
- (
- <span class="optional">optional</span>
- <span id="typeTemplate">
- <span>
- <span>integer</span>
- </span>
- </span>
- )
- </div>
- </em>
- </dt>
- <dd>Y coordinate of the window.</dd>
- <!-- OBJECT PROPERTIES -->
- <!-- OBJECT METHODS -->
- <!-- OBJECT EVENT FIELDS -->
- <!-- FUNCTION PARAMETERS -->
- </div>
- </div><div>
- <div>
- <dt>
- <var>type</var>
- <em>
- <!-- TYPE -->
- <div style="display:inline">
- (
- <span class="optional">optional</span>
- <span id="typeTemplate">
- <span>
- <span>string</span>
- </span>
- </span>
- )
- </div>
- </em>
- </dt>
- <dd>Window type: 'shell' (the default) is the only currently supported value.</dd>
- <!-- OBJECT PROPERTIES -->
- <!-- OBJECT METHODS -->
- <!-- OBJECT EVENT FIELDS -->
- <!-- FUNCTION PARAMETERS -->
- </div>
- </div><div>
- <div>
- <dt>
- <var>width</var>
- <em>
- <!-- TYPE -->
- <div style="display:inline">
- (
- <span class="optional">optional</span>
- <span id="typeTemplate">
- <span>
- <span>integer</span>
- </span>
- </span>
- )
- </div>
- </em>
- </dt>
- <dd>Width of the window.</dd>
- <!-- OBJECT PROPERTIES -->
- <!-- OBJECT METHODS -->
- <!-- OBJECT EVENT FIELDS -->
- <!-- FUNCTION PARAMETERS -->
- </div>
- </div>
- </dl>
- </dd>
- <!-- OBJECT METHODS -->
- <!-- OBJECT EVENT FIELDS -->
- <!-- FUNCTION PARAMETERS -->
- </div>
- </div> <!-- /apiItem -->
- </div> <!-- /apiGroup -->
- </div> <!-- /apiPage -->
+ <!-- /apiPage -->
</div> <!-- /gc-pagecontent -->
</div> <!-- /g-section -->
</div> <!-- /codesiteContent -->
diff --git a/chrome/common/extensions/docs/extensions/samples.html b/chrome/common/extensions/docs/extensions/samples.html
index cb78a2d..42b1296 100644
--- a/chrome/common/extensions/docs/extensions/samples.html
+++ b/chrome/common/extensions/docs/extensions/samples.html
@@ -280,7 +280,7 @@
<span>
<a href="javascript:void(0);" onclick="setFilter('chrome.alarms', this)">chrome.alarms</a><span>, </span>
</span><span>
- <a href="javascript:void(0);" onclick="setFilter('chrome.appWindow', this)">chrome.appWindow</a><span>, </span>
+ <a href="javascript:void(0);" onclick="setFilter('chrome.app.window', this)">chrome.app.window</a><span>, </span>
</span><span>
<a href="javascript:void(0);" onclick="setFilter('chrome.bookmarks', this)">chrome.bookmarks</a><span>, </span>
</span><span>
diff --git a/chrome/common/extensions/docs/samples.json b/chrome/common/extensions/docs/samples.json
index aeb0e85..3f0548f 100644
--- a/chrome/common/extensions/docs/samples.json
+++ b/chrome/common/extensions/docs/samples.json
@@ -6,13 +6,13 @@
"chrome.alarms.get": "alarms.html#method-get",
"chrome.alarms.getAll": "alarms.html#method-getAll",
"chrome.alarms.onAlarm": "alarms.html#event-onAlarm",
- "chrome.appWindow.create": "appWindow.html#method-create",
- "chrome.appWindow.focus": "appWindow.html#method-focus",
- "chrome.appWindow.maximize": "appWindow.html#method-maximize",
- "chrome.appWindow.minimize": "appWindow.html#method-minimize",
- "chrome.appWindow.moveTo": "appWindow.html#method-moveTo",
- "chrome.appWindow.resizeTo": "appWindow.html#method-resizeTo",
- "chrome.appWindow.restore": "appWindow.html#method-restore",
+ "chrome.app.window.create": "app.window.html#method-create",
+ "chrome.app.window.focus": "app.window.html#method-focus",
+ "chrome.app.window.maximize": "app.window.html#method-maximize",
+ "chrome.app.window.minimize": "app.window.html#method-minimize",
+ "chrome.app.window.moveTo": "app.window.html#method-moveTo",
+ "chrome.app.window.resizeTo": "app.window.html#method-resizeTo",
+ "chrome.app.window.restore": "app.window.html#method-restore",
"chrome.bookmarks.create": "bookmarks.html#method-create",
"chrome.bookmarks.get": "bookmarks.html#method-get",
"chrome.bookmarks.getChildren": "bookmarks.html#method-getChildren",
diff --git a/chrome/common/extensions/docs/static/app.window.html b/chrome/common/extensions/docs/static/app.window.html
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/chrome/common/extensions/docs/static/app.window.html
diff --git a/chrome/common/extensions/docs/static/app_external.html b/chrome/common/extensions/docs/static/app_external.html
index 2b21dd8..2c3fd20 100644
--- a/chrome/common/extensions/docs/static/app_external.html
+++ b/chrome/common/extensions/docs/static/app_external.html
@@ -181,14 +181,14 @@ and one for the sandboxed page:
<pre>
chrome.experimental.app.onLaunched.addListener(function() {
- chrome.appWindow.create('window.html', {
+ chrome.app.window.create('window.html', {
'width': 400,
'height': 400,
'left': 0,
'top': 0
});
- chrome.appWindow.create('sandboxed.html', {
+ chrome.app.window.create('sandboxed.html', {
'width': 400,
'height': 400,
'left': 400,
@@ -238,7 +238,7 @@ opens:
var myWin = null;
chrome.experimental.app.onLaunched.addListener(function() {
- chrome.appWindow.create('sandboxed.html', {
+ chrome.app.window.create('sandboxed.html', {
'width': 400,
'height': 400
}, function(win) {
diff --git a/chrome/common/extensions/docs/static/app_hardware.html b/chrome/common/extensions/docs/static/app_hardware.html
index 012fd57..bda5933 100644
--- a/chrome/common/extensions/docs/static/app_hardware.html
+++ b/chrome/common/extensions/docs/static/app_hardware.html
@@ -38,7 +38,7 @@ to the manifest file:
<pre>
"permissions": [
- "appWindow",
+ "app.window",
"experimental",
"usb"
]
diff --git a/chrome/common/extensions/docs/static/app_lifecycle.html b/chrome/common/extensions/docs/static/app_lifecycle.html
index 5a48c1f..5b33094 100644
--- a/chrome/common/extensions/docs/static/app_lifecycle.html
+++ b/chrome/common/extensions/docs/static/app_lifecycle.html
@@ -101,7 +101,7 @@ for example, a chat panel.
<pre>
chrome.experimental.app.onLaunched.addListener(function() {
- chrome.appWindow.create('main.html', {
+ chrome.app.window.create('main.html', {
width: 800,
height: 600,
minWidth: 800,
@@ -119,7 +119,7 @@ chrome.experimental.app.onLaunched.addListener(function() {
<pre>
chrome.experimental.app.onLaunched.addListener(function() {
- chrome.appWindow.create('index.html', {
+ chrome.app.window.create('index.html', {
width: 400,
height: 200,
type: 'panel'
diff --git a/chrome/common/extensions/docs/static/first_app.html b/chrome/common/extensions/docs/static/first_app.html
index 4a2861b..2005e36 100644
--- a/chrome/common/extensions/docs/static/first_app.html
+++ b/chrome/common/extensions/docs/static/first_app.html
@@ -53,7 +53,7 @@ describes this manifest in detail):
"scripts": ["background.js"]
}
},
- "permissions": ["experimental", "appWindow"],
+ "permissions": ["experimental", "app.window"],
"icons": { "16": "calculator-16.png", "128": "calculator-128.png" }
}
</pre>
@@ -73,7 +73,7 @@ with the following content:
<pre>
chrome.experimental.app.onLaunched.addListener(function() {
- chrome.appWindow.create('window.html', {
+ chrome.app.window.create('window.html', {
'width': 400,
'height': 500
});
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index b7a4404..99ad3f7 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -3113,7 +3113,7 @@ bool Extension::InitFromValue(int flags, string16* error) {
}
// TODO(jeremya/kalman) do this via the features system by exposing the
- // appWindow API to platform apps, with no dependency on any permissions.
+ // app.window API to platform apps, with no dependency on any permissions.
// See http://crbug.com/120069.
if (is_platform_app())
api_permissions.insert(APIPermission::kAppWindow);
diff --git a/chrome/common/extensions/permissions/api_permission.cc b/chrome/common/extensions/permissions/api_permission.cc
index 818e9045..03b141a 100644
--- a/chrome/common/extensions/permissions/api_permission.cc
+++ b/chrome/common/extensions/permissions/api_permission.cc
@@ -156,7 +156,7 @@ void APIPermission::RegisterAllPermissions(
// Platform-app permissions.
{ kSocket, "socket", kFlagCannotBeOptional },
- { kAppWindow, "appWindow" },
+ { kAppWindow, "app.window" },
{ kAudioCapture, "audioCapture", kFlagNone,
IDS_EXTENSION_PROMPT_WARNING_AUDIO_CAPTURE,
PermissionMessage::kAudioCapture },
generated by cgit v1.1 at 2025-02-12 08:50:27 +0000