Merge branch 'master' into roller/chromium/master
This commit is contained in:
commit
5d13820441
28 changed files with 226 additions and 103 deletions
|
@ -264,7 +264,7 @@ void Menu::OnMenuWillClose() {
|
|||
}
|
||||
|
||||
void Menu::OnMenuWillShow() {
|
||||
Pin(v8::Isolate::GetCurrent());
|
||||
Pin(JavascriptEnvironment::GetIsolate());
|
||||
Emit("menu-will-show");
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue