aboutsummaryrefslogtreecommitdiffstats
path: root/src/com/vaadin/terminal/gwt/server/WrappedHttpServletRequest.java
diff options
context:
space:
mode:
authorMarc Englund <marc@vaadin.com>2011-12-20 15:34:03 +0200
committerMarc Englund <marc@vaadin.com>2011-12-21 09:21:36 +0200
commitca51ee58ac00257eee4adaf8e92c0195c6a1003c (patch)
tree866fda6e1a90b3995dda580aa74a3987da6091a0 /src/com/vaadin/terminal/gwt/server/WrappedHttpServletRequest.java
parent7e594fb40fd2a9ad1759d422a62a5c4045351e6d (diff)
downloadvaadin-framework-ca51ee58ac00257eee4adaf8e92c0195c6a1003c.tar.gz
vaadin-framework-ca51ee58ac00257eee4adaf8e92c0195c6a1003c.zip
Initial unsupported-browser-warning-page for #7985
Includes support for checking isChromeFrame and isChromeFrameCapable. Warning page can be bypassed with cookie. Works, but needs more thought, and it seems the (V)BrowserDetails and WebBrowser mess should be simplified somehow.
Diffstat (limited to 'src/com/vaadin/terminal/gwt/server/WrappedHttpServletRequest.java')
-rw-r--r--src/com/vaadin/terminal/gwt/server/WrappedHttpServletRequest.java18
1 files changed, 16 insertions, 2 deletions
diff --git a/src/com/vaadin/terminal/gwt/server/WrappedHttpServletRequest.java b/src/com/vaadin/terminal/gwt/server/WrappedHttpServletRequest.java
index 88ba0499a1..5998f905c1 100644
--- a/src/com/vaadin/terminal/gwt/server/WrappedHttpServletRequest.java
+++ b/src/com/vaadin/terminal/gwt/server/WrappedHttpServletRequest.java
@@ -11,6 +11,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
+import com.vaadin.Application;
import com.vaadin.terminal.CombinedRequest;
import com.vaadin.terminal.DeploymentConfiguration;
import com.vaadin.terminal.WrappedRequest;
@@ -102,8 +103,21 @@ public class WrappedHttpServletRequest implements WrappedRequest {
}
public BrowserDetails getBrowserDetails() {
- // No browserDetails available for normal requests
- return null;
+ return new BrowserDetails() {
+ public String getUriFragment() {
+ return null;
+ }
+
+ public String getWindowName() {
+ return null;
+ }
+
+ public WebBrowser getWebBrowser() {
+ WebApplicationContext context = (WebApplicationContext) Application
+ .getCurrentApplication().getContext();
+ return context.getBrowser();
+ }
+ };
}
public Locale getLocale() {