diff --git a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/NewWindowEvent.java b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/NewWindowEvent.java index d290eb2e6e1..368ab99bc77 100644 --- a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/NewWindowEvent.java +++ b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/NewWindowEvent.java @@ -147,18 +147,6 @@ public List getRealizeNewWindowRunnableList() { return browserWillAdd; } -public static class RealizeNewWindowEvent { - private BrowserControl browserControl; - - public BrowserControl getBrowserControl() { - return browserControl; - } - - public void setBrowserControl(BrowserControl browserControl) { - this.browserControl = browserControl; - } -} - public Runnable getRealizeNewWindowRunnable() { return realizeNewWindowRunnable; } @@ -167,5 +155,4 @@ public static class RealizeNewWindowEvent { this.realizeNewWindowRunnable = realizeNewWindowRunnable; } - } // end of class NewWindowEvent diff --git a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/EventRegistrationImpl.java b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/EventRegistrationImpl.java index 2eb367ae1f3..65d28e504ba 100644 --- a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/EventRegistrationImpl.java +++ b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/EventRegistrationImpl.java @@ -821,4 +821,4 @@ class URIToStringMap extends Object implements Map { } -} // end of class EventRegistrationImpl \ No newline at end of file +} // end of class EventRegistrationImpl>>>>>>> 1.22 diff --git a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/NativeBrowserControlCanvas.java b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/NativeBrowserControlCanvas.java index 80a2970f3b5..c95e64d37dc 100644 --- a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/NativeBrowserControlCanvas.java +++ b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/NativeBrowserControlCanvas.java @@ -88,6 +88,7 @@ abstract class NativeBrowserControlCanvas extends BrowserControlCanvas { */ abstract protected int getWindow(); + abstract void performPlatformAppropriateNewWindowRealization(NewWindowEvent event); /** * Allow platform specific handling of new window creation.