Normandy Merge ....

git-svn-id: svn://10.0.0.236/trunk@4231 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/cmd/winfe/fegrid.cpp

@@ -18,6 +18,7 @@
 
 
 #include "stdafx.h"
+#include "rosetta.h"
 #include "gridedge.h"
 #include "netsvw.h"
 #include "template.h"
@@ -926,9 +927,7 @@ void FE_QueryChrome(MWContext *pContext, Chrome *pChrome)
         pChrome->show_url_bar = pIChrome->GetToolbarVisible(ID_LOCATION_TOOLBAR);
         pChrome->show_directory_buttons = pIChrome->GetToolbarVisible(ID_PERSONAL_TOOLBAR);
 
-        //	The security bar?
-        //  TODO: Fix me!
-        pChrome->show_security_bar = TRUE;
+        HG28762
 
         //	Status bar!
         LPNSSTATUSBAR pIStatusBar = NULL;