diff options
Diffstat (limited to 'webkit/tools/test_shell/test_shell_gtk.cc')
| -rw-r--r-- | webkit/tools/test_shell/test_shell_gtk.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc index ee3c6ed..b637f98 100644 --- a/webkit/tools/test_shell/test_shell_gtk.cc +++ b/webkit/tools/test_shell/test_shell_gtk.cc @@ -53,14 +53,7 @@ namespace { // Callback for when the main window is destroyed. void MainWindowDestroyed(GtkWindow* window, TestShell* shell) { - // TODO(evanm): make WindowList a list of GtkWindow*, so this - // reinterpret_cast isn't necessary. - WindowList::iterator entry = - std::find(TestShell::windowList()->begin(), - TestShell::windowList()->end(), - GTK_WIDGET(window)); - if (entry != TestShell::windowList()->end()) - TestShell::windowList()->erase(entry); + TestShell::RemoveWindowFromList(GTK_WIDGET(window)); if (TestShell::windowList()->empty() || shell->is_modal()) { MessageLoop::current()->PostTask(FROM_HERE, @@ -193,7 +186,8 @@ void TestShell::InteractiveSetFocus(WebWidgetHost* host, bool enable) { } void TestShell::DestroyWindow(gfx::WindowHandle windowHandle) { - NOTIMPLEMENTED(); + RemoveWindowFromList(windowHandle); + gtk_widget_destroy(windowHandle); } WebWidget* TestShell::CreatePopupWidget(WebView* webview) { |