Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test: move some BrowserWindow specs to the main process #19182

Merged
merged 20 commits into from
Jul 16, 2019
Merged

test: move some BrowserWindow specs to the main process #19182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
b0dac22
test: move some BrowserWindow specs to the main process
nornagon Jul 9, 2019
8db920c
uncomment cross-site test
nornagon Jul 9, 2019
74e28df
move more tests
nornagon Jul 9, 2019
63d2c09
re-enable, refactor and move visibilitychange specs
nornagon Jul 9, 2019
2add068
move new-window event tests and re-enable them on mac
nornagon Jul 10, 2019
a0ff73e
move max/minimize event tests
nornagon Jul 10, 2019
b8bed8d
move modal tests
nornagon Jul 10, 2019
19e8a81
move beginFrameSubscription tests
nornagon Jul 10, 2019
49210b1
move savePage test
nornagon Jul 10, 2019
c9c601a
move BrowserWindow options argument is optional test
nornagon Jul 10, 2019
ee5b8f0
move restore, unmaximize, fullscreen tests
nornagon Jul 10, 2019
93efb19
move parent window tests
nornagon Jul 10, 2019
46e563b
don't wait for show event on windows (#8664)
nornagon Jul 11, 2019
322889c
add debugging logs to fullscreen tests
nornagon Jul 11, 2019
a097c27
more debugging on windows
nornagon Jul 11, 2019
77192fd
explicitly destroy browserviews to prevent crash during gc
nornagon Jul 11, 2019
d76910b
only await show on darwin
nornagon Jul 11, 2019
0f4098f
more event timing fixes
nornagon Jul 11, 2019
04542dc
Merge remote-tracking branch 'origin/master' into move-browser-window…
nornagon Jul 12, 2019
bfdd61b
disable max/minimize event tests on linux, since they're broken on CI
nornagon Jul 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion docs/api/browser-window.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,6 +954,10 @@ Returns [`Rectangle`](structures/rectangle.md) - Contains the window bounds of t

Disable or enable the window.

#### `win.isEnabled()`

Returns Boolean - whether the window is enabled.

#### `win.setSize(width, height[, animate])`

* `width` Integer
Expand Down Expand Up @@ -1566,7 +1570,7 @@ On macOS it does not remove the focus from the window.

#### `win.setParentWindow(parent)`

* `parent` BrowserWindow
* `parent` BrowserWindow | null

Sets `parent` as current window's parent window, passing `null` will turn
current window into a top-level window.
Expand Down
6 changes: 2 additions & 4 deletions shell/browser/api/atom_api_system_preferences_mac.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,14 +218,12 @@ AVMediaType ParseMediaType(const std::string& media_type) {

if (user_info) {
copied_callback.Run(
base::SysNSStringToUTF8(notification.name),
*user_info,
base::SysNSStringToUTF8(notification.name), *user_info,
object);
} else {
copied_callback.Run(
base::SysNSStringToUTF8(notification.name),
base::DictionaryValue(),
object);
base::DictionaryValue(), object);
}
}];
return request_id;
Expand Down