--- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpUiCallbacks.cpp Thu Aug 19 10:58:56 2010 +0300
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpUiCallbacks.cpp Tue Aug 31 16:17:46 2010 +0300
@@ -19,7 +19,7 @@
#include "Page.h"
#include <../bidi.h>
#include <StringLoader.h>
-#include <Uri16.h>
+#include <uri16.h>
#include <es_enum.h>
#include <Webkit.rsg>
#include "WebFrame.h"
@@ -27,12 +27,12 @@
#include "WebView.h"
#include "BrCtl.h"
#include "SettingsContainer.h"
-#include <brctlspecialloadobserver.h>
+#include "BrCtlSpecialLoadObserver.h"
#include "StaticObjectsContainer.h"
#include "ResourceLoaderDelegate.h"
#include "HttpDefs.h"
#include "HttpConnection.h"
-#include "CDBCols.h"
+#include "cdbcols.h"
using namespace WebCore;
@@ -181,7 +181,7 @@
}
case ESomeItemsNotSecure:
{
- resId = 0;
+ resId = R_HTTPSEC_SOME_ITEMS_NOT_SECURE;
event = TBrCtlDefs::EEventSomeItemsNotSecure;
break;
}
@@ -245,9 +245,7 @@
}
// If the user selected "No" or "Cancel", we are cancelling the load
if ( !result )
- { //Update history view Index also here...
- if( brctl->historyHandler()->historyController()->historyViewEnabled() )
- brctl->historyHandler()->historyController()->rollBackIndex();
+ {
brctl->HandleBrowserLoadEventL(TBrCtlDefs::EEventContentFinished,0,0);
return KErrCancel;
}