equal
deleted
inserted
replaced
17 |
17 |
18 #include "HttpUiCallbacks.h" |
18 #include "HttpUiCallbacks.h" |
19 #include "Page.h" |
19 #include "Page.h" |
20 #include <../bidi.h> |
20 #include <../bidi.h> |
21 #include <StringLoader.h> |
21 #include <StringLoader.h> |
22 #include <Uri16.h> |
22 #include <uri16.h> |
23 #include <es_enum.h> |
23 #include <es_enum.h> |
24 #include <Webkit.rsg> |
24 #include <Webkit.rsg> |
25 #include "WebFrame.h" |
25 #include "WebFrame.h" |
26 #include "WebFrameView.h" |
26 #include "WebFrameView.h" |
27 #include "WebView.h" |
27 #include "WebView.h" |
28 #include "BrCtl.h" |
28 #include "BrCtl.h" |
29 #include "SettingsContainer.h" |
29 #include "SettingsContainer.h" |
30 #include <brctlspecialloadobserver.h> |
30 #include "BrCtlSpecialLoadObserver.h" |
31 #include "StaticObjectsContainer.h" |
31 #include "StaticObjectsContainer.h" |
32 #include "ResourceLoaderDelegate.h" |
32 #include "ResourceLoaderDelegate.h" |
33 #include "HttpDefs.h" |
33 #include "HttpDefs.h" |
34 #include "HttpConnection.h" |
34 #include "HttpConnection.h" |
35 #include "CDBCols.h" |
35 #include "cdbcols.h" |
36 |
36 |
37 using namespace WebCore; |
37 using namespace WebCore; |
38 |
38 |
39 // CONSTANTS |
39 // CONSTANTS |
40 _LIT (KEmptyTitle, ""); |
40 _LIT (KEmptyTitle, ""); |
179 event = TBrCtlDefs::EEventEnteringSecurePage; |
179 event = TBrCtlDefs::EEventEnteringSecurePage; |
180 break; |
180 break; |
181 } |
181 } |
182 case ESomeItemsNotSecure: |
182 case ESomeItemsNotSecure: |
183 { |
183 { |
184 resId = 0; |
184 resId = R_HTTPSEC_SOME_ITEMS_NOT_SECURE; |
185 event = TBrCtlDefs::EEventSomeItemsNotSecure; |
185 event = TBrCtlDefs::EEventSomeItemsNotSecure; |
186 break; |
186 break; |
187 } |
187 } |
188 case ESubmittingToNonSecurePage: |
188 case ESubmittingToNonSecurePage: |
189 { |
189 { |
243 { |
243 { |
244 return KErrNoMemory; |
244 return KErrNoMemory; |
245 } |
245 } |
246 // If the user selected "No" or "Cancel", we are cancelling the load |
246 // If the user selected "No" or "Cancel", we are cancelling the load |
247 if ( !result ) |
247 if ( !result ) |
248 { //Update history view Index also here... |
248 { |
249 if( brctl->historyHandler()->historyController()->historyViewEnabled() ) |
|
250 brctl->historyHandler()->historyController()->rollBackIndex(); |
|
251 brctl->HandleBrowserLoadEventL(TBrCtlDefs::EEventContentFinished,0,0); |
249 brctl->HandleBrowserLoadEventL(TBrCtlDefs::EEventContentFinished,0,0); |
252 return KErrCancel; |
250 return KErrCancel; |
253 } |
251 } |
254 } // end of if |
252 } // end of if |
255 if(result && event != TBrCtlDefs::EEventNone) |
253 if(result && event != TBrCtlDefs::EEventNone) |