From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Tue, 9 Nov 2010 15:46:54 +0000 (+0000)
Subject: fixes #5261, default header now contains X-UA-Compatible = chrome1 to use chrome... 
X-Git-Tag: 6.7.0.beta1~896
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7d7d63feb7913ea6a273e941c594d3f4722c54cf;p=vaadin-framework.git

fixes #5261, default header now contains X-UA-Compatible = chrome1 to use chrome frame when installed on IE

svn changeset:15942/svn branch:6.5
---

diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
index df946dd820..5b422b226d 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
@@ -1908,8 +1908,9 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
             String title, String themeUri) throws IOException {
         page.write("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>\n");
 
-        // Force IE9 into IE8 mode. Remove when IE 9 mode works (#5546)
-        page.write("<meta http-equiv=\"X-UA-Compatible\" content=\"IE=8\"/>\n");
+        // Force IE9 into IE8 mode. Remove when IE 9 mode works (#5546), chrome
+        // frame if available #5261
+        page.write("<meta http-equiv=\"X-UA-Compatible\" content=\"IE=8,chrome=1\"/>\n");
 
         page.write("<style type=\"text/css\">"
                 + "html, body {height:100%;margin:0;}</style>");