| Index: chrome/common/extensions/api/app_window.idl
|
| diff --git a/chrome/common/extensions/api/app_window.idl b/chrome/common/extensions/api/app_window.idl
|
| index 6ccbac78c2d40a64915d0128c7264fa8c8124dd5..66f728f07aeef8c64eae9e489575e181e3de0ca9 100644
|
| --- a/chrome/common/extensions/api/app_window.idl
|
| +++ b/chrome/common/extensions/api/app_window.idl
|
| @@ -15,7 +15,7 @@ namespace app.window {
|
| long? height;
|
| };
|
|
|
| - [nodoc] dictionary BoundsSpecification {
|
| + dictionary BoundsSpecification {
|
| // The X coordinate of the content or window.
|
| long? left;
|
|
|
| @@ -93,6 +93,34 @@ namespace app.window {
|
| // creating a new window.
|
| DOMString? id;
|
|
|
| + // Used to specify the initial position, initial size and constraints of the
|
| + // window's content (excluding window decorations).
|
| + // If an <code>id</code> is also specified and a window with a matching
|
| + // <code>id</code> has been shown before, the remembered bounds will be used
|
| + // instead.
|
| + //
|
| + // Note that the padding between the inner and outer bounds is determined by
|
| + // the OS. Therefore setting the same bounds property for both the
|
| + // <code>innerBounds</code> and <code>outerBounds</code> will result in an
|
| + // error.
|
| + //
|
| + // Currently only available on the Dev channel from Chrome 35.
|
| + BoundsSpecification? innerBounds;
|
| +
|
| + // Used to specify the initial position, initial size and constraints of the
|
| + // window (including window decorations such as the title bar and frame).
|
| + // If an <code>id</code> is also specified and a window with a matching
|
| + // <code>id</code> has been shown before, the remembered bounds will be used
|
| + // instead.
|
| + //
|
| + // Note that the padding between the inner and outer bounds is determined by
|
| + // the OS. Therefore setting the same bounds property for both the
|
| + // <code>innerBounds</code> and <code>outerBounds</code> will result in an
|
| + // error.
|
| + //
|
| + // Currently only available on the Dev channel from Chrome 35.
|
| + BoundsSpecification? outerBounds;
|
| +
|
| // Default width of the window.
|
| [nodoc, deprecated="Use $ref:BoundsSpecification."] long? defaultWidth;
|
|
|
| @@ -252,36 +280,36 @@ namespace app.window {
|
| // Set the window's inner bounds.
|
| static void setBounds(ContentBounds bounds);
|
|
|
| - // Get the current minimum width of the window. Returns |undefined| if there
|
| - // is no minimum. Currently only available on the Dev channel.
|
| + // Get the current minimum width of the window. Returns <code>null</code> if
|
| + // there is no minimum. Currently only available on the Dev channel.
|
| [nocompile] static long getMinWidth();
|
|
|
| - // Get the current minimum height of the window. Returns |undefined| if
|
| - // there is no minimum. Currently only available on the Dev channel.
|
| + // Get the current minimum height of the window. Returns <code>null</code>
|
| + // if there is no minimum. Currently only available on the Dev channel.
|
| [nocompile] static long getMinHeight();
|
|
|
| - // Get the current maximum width of the window. Returns |undefined| if there
|
| - // is no maximum. Currently only available on the Dev channel.
|
| + // Get the current maximum width of the window. Returns <code>null</code> if
|
| + // there is no maximum. Currently only available on the Dev channel.
|
| [nocompile] static long getMaxWidth();
|
|
|
| - // Get the current maximum height of the window. Returns |undefined| if
|
| - // there is no maximum. Currently only available on the Dev channel.
|
| + // Get the current maximum height of the window. Returns <code>null</code>
|
| + // if there is no maximum. Currently only available on the Dev channel.
|
| [nocompile] static long getMaxHeight();
|
|
|
| - // Set the current minimum width of the window. Set to |null| to remove the
|
| - // constraint. Currently only available on the Dev channel.
|
| + // Set the current minimum width of the window. Set to <code>null</code> to
|
| + // remove the constraint. Currently only available on the Dev channel.
|
| static void setMinWidth(optional long minWidth);
|
|
|
| - // Set the current minimum height of the window. Set to |null| to remove the
|
| - // constraint. Currently only available on the Dev channel.
|
| + // Set the current minimum height of the window. Set to <code>null</code> to
|
| + // remove the constraint. Currently only available on the Dev channel.
|
| static void setMinHeight(optional long minHeight);
|
|
|
| - // Set the current maximum width of the window. Set to |null| to remove the
|
| - // constraint. Currently only available on the Dev channel.
|
| + // Set the current maximum width of the window. Set to <code>null</code> to
|
| + // remove the constraint. Currently only available on the Dev channel.
|
| static void setMaxWidth(optional long maxWidth);
|
|
|
| - // Set the current maximum height of the window. Set to |null| to remove the
|
| - // constraint. Currently only available on the Dev channel.
|
| + // Set the current maximum height of the window. Set to <code>null</code> to
|
| + // remove the constraint. Currently only available on the Dev channel.
|
| static void setMaxHeight(optional long maxHeight);
|
|
|
| // Set the app icon for the window (experimental).
|
| @@ -331,11 +359,11 @@ namespace app.window {
|
| // all, in which case a default size and platform dependent position will
|
| // be used.
|
| //
|
| - // Another option is to use the bounds property, which will put the window
|
| - // at the specified coordinates with the specified size. If the window has
|
| - // a frame, it's total size will be the size given plus the size of the
|
| - // frame; that is, the size in bounds is the content size, not the window
|
| - // size.
|
| + // Another option is to use the <code>bounds</code> property, which will put
|
| + // the window at the specified coordinates with the specified size. If the
|
| + // window has a frame, it's total size will be the size given plus the size
|
| + // of the frame; that is, the size in bounds is the content size, not the
|
| + // window size.
|
| //
|
| // To automatically remember the positions of windows you can give them ids.
|
| // If a window has an id, This id is used to remember the size and position
|
|
|